summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/.git-dpm11
-rw-r--r--debian/.gitignore17
-rw-r--r--debian/.gitlab-ci.yml9
-rw-r--r--debian/NEWS247
-rw-r--r--debian/README.Debian275
-rwxr-xr-xdebian/adjust-openssl-dependencies36
-rwxr-xr-xdebian/agent-launch23
-rw-r--r--debian/changelog5406
-rw-r--r--debian/clean2
-rw-r--r--debian/compat1
-rw-r--r--debian/control231
-rw-r--r--debian/copyright247
-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.install34
-rw-r--r--debian/openssh-client.links4
-rw-r--r--debian/openssh-client.lintian-overrides1
-rw-r--r--debian/openssh-client.maintscript1
-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.config46
-rw-r--r--debian/openssh-server.examples1
-rwxr-xr-xdebian/openssh-server.install21
-rw-r--r--debian/openssh-server.links0
-rw-r--r--debian/openssh-server.maintscript3
-rw-r--r--debian/openssh-server.postinst167
-rw-r--r--debian/openssh-server.postrm35
-rw-r--r--debian/openssh-server.preinst18
-rw-r--r--debian/openssh-server.ssh.default5
-rwxr-xr-xdebian/openssh-server.ssh.init162
l---------debian/openssh-server.ssh.service1
-rw-r--r--debian/openssh-server.sshd.pam.in55
-rw-r--r--debian/openssh-server.templates23
-rw-r--r--debian/openssh-server.ucf-md5sum48
-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/openssh-tests.install11
-rw-r--r--debian/patches/authorized-keys-man-symlink.patch26
-rw-r--r--debian/patches/check-filenames-in-scp-client.patch187
-rw-r--r--debian/patches/conch-old-privkey-format.patch71
-rw-r--r--debian/patches/debian-banner.patch111
-rw-r--r--debian/patches/debian-config.patch238
-rw-r--r--debian/patches/dnssec-sshfp.patch94
-rw-r--r--debian/patches/doc-hash-tab-completion.patch28
-rw-r--r--debian/patches/fix-key-type-check.patch88
-rw-r--r--debian/patches/gnome-ssh-askpass2-icon.patch26
-rw-r--r--debian/patches/gssapi.patch3353
-rw-r--r--debian/patches/have-progressmeter-force-update-at-beginning-and-end-transfer.patch120
-rw-r--r--debian/patches/keepalive-extensions.patch134
-rw-r--r--debian/patches/mention-ssh-keygen-on-keychange.patch44
-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.patch61
-rw-r--r--debian/patches/request-rsa-sha2-cert-signatures.patch39
-rw-r--r--debian/patches/restore-authorized_keys2.patch35
-rw-r--r--debian/patches/restore-tcp-wrappers.patch172
-rw-r--r--debian/patches/sanitize-scp-filenames-via-snmprintf.patch276
-rw-r--r--debian/patches/scp-disallow-dot-or-empty-filename.patch32
-rw-r--r--debian/patches/scp-handle-braces.patch353
-rw-r--r--debian/patches/scp-quoting.patch41
-rw-r--r--debian/patches/seccomp-s390-flock-ipc.patch47
-rw-r--r--debian/patches/seccomp-s390-ioctl-ep11-crypto.patch33
-rw-r--r--debian/patches/selinux-role.patch472
-rw-r--r--debian/patches/series33
-rw-r--r--debian/patches/shell-path.patch39
-rw-r--r--debian/patches/ssh-agent-setgid.patch40
-rw-r--r--debian/patches/ssh-argv0.patch31
-rw-r--r--debian/patches/ssh-vulnkey-compat.patch42
-rw-r--r--debian/patches/syslog-level-silent.patch47
-rw-r--r--debian/patches/systemd-readiness.patch84
-rw-r--r--debian/patches/user-group-modes.patch210
-rw-r--r--debian/po/POTFILES.in1
-rw-r--r--debian/po/cs.po55
-rw-r--r--debian/po/da.po55
-rw-r--r--debian/po/de.po61
-rw-r--r--debian/po/es.po80
-rw-r--r--debian/po/fr.po59
-rw-r--r--debian/po/it.po58
-rw-r--r--debian/po/ja.po55
-rw-r--r--debian/po/nl.po60
-rw-r--r--debian/po/pt.po59
-rw-r--r--debian/po/pt_BR.po57
-rw-r--r--debian/po/ru.po57
-rw-r--r--debian/po/sv.po58
-rw-r--r--debian/po/templates.pot46
-rw-r--r--debian/po/tr.po58
-rwxr-xr-xdebian/rules230
-rwxr-xr-xdebian/run-tests39
-rw-r--r--debian/source/format1
-rw-r--r--debian/source/include-binaries1
-rw-r--r--debian/source/lintian-overrides2
-rw-r--r--debian/ssh-argv031
-rw-r--r--debian/ssh-argv0.164
-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.maintscript1
-rw-r--r--debian/systemd/rescue-ssh.target6
-rw-r--r--debian/systemd/ssh-agent.override1
-rw-r--r--debian/systemd/ssh-agent.service11
-rwxr-xr-xdebian/systemd/ssh-session-cleanup11
-rw-r--r--debian/systemd/ssh-session-cleanup.service13
-rw-r--r--debian/systemd/ssh.service22
-rw-r--r--debian/systemd/ssh.socket12
-rw-r--r--debian/systemd/ssh@.service11
-rw-r--r--debian/tests/control10
-rwxr-xr-xdebian/tests/regress66
-rw-r--r--debian/upstream/signing-key.asc41
-rw-r--r--debian/watch3
125 files changed, 16945 insertions, 0 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 000000000..6e6c8addb
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,11 @@
1# see git-dpm(1) from git-dpm package
27a3fa37583d4abf128f7f4c6eb1e7ffc90115eab
37a3fa37583d4abf128f7f4c6eb1e7ffc90115eab
43d246f10429fc9a37b98eabef94fe8dc7c61002b
53d246f10429fc9a37b98eabef94fe8dc7c61002b
6openssh_7.9p1.orig.tar.gz
7993aceedea8ecabb1d0dd7293508a361891c4eaa
81565384
9debianTag="debian/%e%%%V"
10patchedTag="patched/%e%%%V"
11upstreamTag="upstream/%U"
diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 000000000..988323b00
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1,17 @@
1/*.debhelper*
2/*substvars
3/build-deb
4/build-udeb
5/files
6/keygen-test/key1
7/keygen-test/key1.pub
8/keygen-test/key2
9/keygen-test/key2.pub
10/openssh-client
11/openssh-client-udeb
12/openssh-server
13/openssh-server-udeb
14/ssh
15/ssh-askpass-gnome
16/ssh-krb5
17/tmp
diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
new file mode 100644
index 000000000..845003caf
--- /dev/null
+++ b/debian/.gitlab-ci.yml
@@ -0,0 +1,9 @@
1image: registry.gitlab.com/eighthave/ci-image-git-buildpackage:latest
2
3build:
4 artifacts:
5 paths:
6 - "*.deb"
7 expire_in: 1 day
8 script:
9 - gitlab-ci-git-buildpackage-all
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000000000..c0a535cf2
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,247 @@
1openssh (1:7.9p1-1) unstable; urgency=medium
2
3 OpenSSH 7.9 includes a number of changes that may affect existing
4 configurations:
5
6 * ssh(1), sshd(8): the setting of the new CASignatureAlgorithms option
7 bans the use of DSA keys as certificate authorities.
8 * sshd(8): the authentication success/failure log message has changed
9 format slightly. It now includes the certificate fingerprint
10 (previously it included only key ID and CA key fingerprint).
11
12 -- Colin Watson <cjwatson@debian.org> Sun, 21 Oct 2018 10:39:24 +0100
13
14openssh (1:7.8p1-1) unstable; urgency=medium
15
16 OpenSSH 7.8 includes a number of changes that may affect existing
17 configurations:
18
19 * ssh-keygen(1): Write OpenSSH format private keys by default instead of
20 using OpenSSL's PEM format. The OpenSSH format, supported in OpenSSH
21 releases since 2014 and described in the PROTOCOL.key file in the
22 source distribution, offers substantially better protection against
23 offline password guessing and supports key comments in private keys.
24 If necessary, it is possible to write old PEM-style keys by adding "-m
25 PEM" to ssh-keygen's arguments when generating or updating a key.
26 * sshd(8): Remove internal support for S/Key multiple factor
27 authentication. S/Key may still be used via PAM or BSD auth.
28 * ssh(1): Remove vestigial support for running ssh(1) as setuid. This
29 used to be required for hostbased authentication and the (long gone)
30 rhosts-style authentication, but has not been necessary for a long
31 time. Attempting to execute ssh as a setuid binary, or with uid !=
32 effective uid will now yield a fatal error at runtime.
33 * sshd(8): The semantics of PubkeyAcceptedKeyTypes and the similar
34 HostbasedAcceptedKeyTypes options have changed. These now specify
35 signature algorithms that are accepted for their respective
36 authentication mechanism, where previously they specified accepted key
37 types. This distinction matters when using the RSA/SHA2 signature
38 algorithms "rsa-sha2-256", "rsa-sha2-512" and their certificate
39 counterparts. Configurations that override these options but omit
40 these algorithm names may cause unexpected authentication failures (no
41 action is required for configurations that accept the default for these
42 options).
43 * sshd(8): The precedence of session environment variables has changed.
44 ~/.ssh/environment and environment="..." options in authorized_keys
45 files can no longer override SSH_* variables set implicitly by sshd.
46 * ssh(1)/sshd(8): The default IPQoS used by ssh/sshd has changed. They
47 will now use DSCP AF21 for interactive traffic and CS1 for bulk. For a
48 detailed rationale, please see the commit message:
49 https://cvsweb.openbsd.org/src/usr.bin/ssh/readconf.c#rev1.284
50
51 -- Colin Watson <cjwatson@debian.org> Thu, 30 Aug 2018 15:35:27 +0100
52
53openssh (1:7.6p1-1) unstable; urgency=medium
54
55 OpenSSH 7.6 includes a number of changes that may affect existing
56 configurations:
57
58 * ssh(1): Delete SSH protocol version 1 support, associated configuration
59 options and documentation.
60 * ssh(1)/sshd(8): Remove support for the hmac-ripemd160 MAC.
61 * ssh(1)/sshd(8): Remove support for the arcfour, blowfish and CAST
62 ciphers.
63 * Refuse RSA keys <1024 bits in length and improve reporting for keys
64 that do not meet this requirement.
65 * ssh(1): Do not offer CBC ciphers by default.
66
67 -- Colin Watson <cjwatson@debian.org> Fri, 06 Oct 2017 12:36:48 +0100
68
69openssh (1:7.5p1-1) experimental; urgency=medium
70
71 OpenSSH 7.5 includes a number of changes that may affect existing
72 configurations:
73
74 * This release deprecates the sshd_config UsePrivilegeSeparation option,
75 thereby making privilege separation mandatory.
76
77 * The format of several log messages emitted by the packet code has
78 changed to include additional information about the user and their
79 authentication state. Software that monitors ssh/sshd logs may need to
80 account for these changes. For example:
81
82 Connection closed by user x 1.1.1.1 port 1234 [preauth]
83 Connection closed by authenticating user x 10.1.1.1 port 1234 [preauth]
84 Connection closed by invalid user x 1.1.1.1 port 1234 [preauth]
85
86 Affected messages include connection closure, timeout, remote
87 disconnection, negotiation failure and some other fatal messages
88 generated by the packet code.
89
90 -- Colin Watson <cjwatson@debian.org> Sun, 02 Apr 2017 02:58:01 +0100
91
92openssh (1:7.4p1-7) unstable; urgency=medium
93
94 This version restores the default for AuthorizedKeysFile to search both
95 ~/.ssh/authorized_keys and ~/.ssh/authorized_keys2, as was the case in
96 Debian configurations before 1:7.4p1-1. Upstream intends to phase out
97 searching ~/.ssh/authorized_keys2 by default, so you should ensure that
98 you are only using ~/.ssh/authorized_keys, at least for critical
99 administrative access; do not assume that the current default will remain
100 in place forever.
101
102 -- Colin Watson <cjwatson@debian.org> Sun, 05 Mar 2017 02:12:42 +0000
103
104openssh (1:7.4p1-1) unstable; urgency=medium
105
106 OpenSSH 7.4 includes a number of changes that may affect existing
107 configurations:
108
109 * ssh(1): Remove 3des-cbc from the client's default proposal. 64-bit
110 block ciphers are not safe in 2016 and we don't want to wait until
111 attacks like SWEET32 are extended to SSH. As 3des-cbc was the only
112 mandatory cipher in the SSH RFCs, this may cause problems connecting to
113 older devices using the default configuration, but it's highly likely
114 that such devices already need explicit configuration for key exchange
115 and hostkey algorithms already anyway.
116 * sshd(8): Remove support for pre-authentication compression. Doing
117 compression early in the protocol probably seemed reasonable in the
118 1990s, but today it's clearly a bad idea in terms of both cryptography
119 (cf. multiple compression oracle attacks in TLS) and attack surface.
120 Pre-auth compression support has been disabled by default for >10
121 years. Support remains in the client.
122 * ssh-agent will refuse to load PKCS#11 modules outside a whitelist of
123 trusted paths by default. The path whitelist may be specified at
124 run-time.
125 * sshd(8): When a forced-command appears in both a certificate and an
126 authorized keys/principals command= restriction, sshd will now refuse
127 to accept the certificate unless they are identical. The previous
128 (documented) behaviour of having the certificate forced-command
129 override the other could be a bit confusing and error-prone.
130 * sshd(8): Remove the UseLogin configuration directive and support for
131 having /bin/login manage login sessions.
132
133 The unprivileged sshd process that deals with pre-authentication network
134 traffic is now subject to additional sandboxing restrictions by default:
135 that is, the default sshd_config now sets UsePrivilegeSeparation to
136 "sandbox" rather than "yes". This has been the case upstream for a while,
137 but until now the Debian configuration diverged unnecessarily.
138
139 -- Colin Watson <cjwatson@debian.org> Tue, 27 Dec 2016 18:01:46 +0000
140
141openssh (1:7.2p1-1) unstable; urgency=medium
142
143 OpenSSH 7.2 disables a number of legacy cryptographic algorithms by
144 default in ssh:
145
146 * Several ciphers blowfish-cbc, cast128-cbc, all arcfour variants and the
147 rijndael-cbc aliases for AES.
148 * MD5-based and truncated HMAC algorithms.
149
150 These algorithms are already disabled by default in sshd.
151
152 -- Colin Watson <cjwatson@debian.org> Tue, 08 Mar 2016 11:47:20 +0000
153
154openssh (1:7.1p1-2) unstable; urgency=medium
155
156 OpenSSH 7.0 disables several pieces of weak, legacy, and/or unsafe
157 cryptography.
158
159 * Support for the legacy SSH version 1 protocol is disabled by default at
160 compile time. Note that this also means that the Cipher keyword in
161 ssh_config(5) is effectively no longer usable; use Ciphers instead for
162 protocol 2. The openssh-client-ssh1 package includes "ssh1", "scp1",
163 and "ssh-keygen1" binaries which you can use if you have no alternative
164 way to connect to an outdated SSH1-only server; please contact the
165 server administrator or system vendor in such cases and ask them to
166 upgrade.
167 * Support for the 1024-bit diffie-hellman-group1-sha1 key exchange is
168 disabled by default at run-time. It may be re-enabled using the
169 instructions at http://www.openssh.com/legacy.html
170 * Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled by
171 default at run-time. These may be re-enabled using the instructions at
172 http://www.openssh.com/legacy.html
173 * Support for the legacy v00 cert format has been removed.
174
175 Future releases will retire more legacy cryptography, including:
176
177 * Refusing all RSA keys smaller than 1024 bits (the current minimum is
178 768 bits).
179 * Several ciphers will be disabled by default: blowfish-cbc, cast128-cbc,
180 all arcfour variants, and the rijndael-cbc aliases for AES.
181 * MD5-based HMAC algorithms will be disabled by default.
182
183 -- Colin Watson <cjwatson@debian.org> Tue, 08 Dec 2015 15:33:08 +0000
184
185openssh (1:6.9p1-1) unstable; urgency=medium
186
187 UseDNS now defaults to 'no'. Configurations that match against the client
188 host name (via sshd_config or authorized_keys) may need to re-enable it or
189 convert to matching against addresses.
190
191 -- Colin Watson <cjwatson@debian.org> Thu, 20 Aug 2015 10:38:58 +0100
192
193openssh (1:6.7p1-5) unstable; urgency=medium
194
195 openssh-server 1:6.7p1-4 changed the default setting of AcceptEnv to list
196 a number of specific LC_FOO variables rather than the wildcard LC_*. I
197 have since been persuaded that this was a bad idea and have reverted it,
198 but it is difficult to automatically undo the change to
199 /etc/ssh/sshd_config without compounding the problem (that of modifying
200 configuration that some users did not want to be modified) further. Most
201 users who upgraded via version 1:6.7p1-4 should restore the previous value
202 of "AcceptEnv LANG LC_*" in /etc/ssh/sshd_config.
203
204 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:09:32 +0000
205
206openssh (1:5.4p1-2) unstable; urgency=low
207
208 Smartcard support is now available using PKCS#11 tokens. If you were
209 previously using an unofficial build of Debian's OpenSSH package with
210 OpenSC-based smartcard support added, then note that commands like
211 'ssh-add -s 0' will no longer work; you need to use 'ssh-add -s
212 /usr/lib/opensc-pkcs11.so' instead.
213
214 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
215
216openssh (1:3.8.1p1-9) experimental; urgency=low
217
218 The ssh package has been split into openssh-client and openssh-server. If
219 you had previously requested that the sshd server should not be run, then
220 that request will still be honoured. However, the recommended approach is
221 now to remove the openssh-server package if you do not want to run sshd.
222 You can remove the old /etc/ssh/sshd_not_to_be_run marker file after doing
223 that.
224
225 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
226
227openssh (1:3.5p1-1) unstable; urgency=low
228
229 This version of OpenSSH disables the environment option for public keys by
230 default, in order to avoid certain attacks (for example, LD_PRELOAD). If
231 you are using this option in an authorized_keys file, beware that the keys
232 in question will no longer work until the option is removed.
233
234 To re-enable this option, set "PermitUserEnvironment yes" in
235 /etc/ssh/sshd_config after the upgrade is complete, taking note of the
236 warning in the sshd_config(5) manual page.
237
238 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
239
240openssh (1:3.0.1p1-1) unstable; urgency=high
241
242 As of version 3, OpenSSH no longer uses separate files for ssh1 and ssh2
243 keys. This means the authorized_keys2 and known_hosts2 files are no longer
244 needed. They will still be read in order to maintain backward
245 compatibility.
246
247 -- 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..48f42c4e8
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,275 @@
1OpenSSH for Debian
2------------------
3
4UPGRADE ISSUES
5==============
6
7PermitRootLogin
8---------------
9
10As of 1:6.6p1-1, new installations will be set to "PermitRootLogin
11without-password" (or the synonymous "PermitRootLogin prohibit-password" as
12of 1:7.1p1-1). This disables password authentication for root, foiling
13password dictionary attacks on the root user. Some sites may wish to use
14the stronger "PermitRootLogin forced-commands-only" or "PermitRootLogin no",
15but note that "PermitRootLogin no" will break setups that SSH to root with a
16forced command to take full-system backups. You can use PermitRootLogin in
17a Match block if you want finer-grained control here.
18
19For many years Debian's OpenSSH packaging used "PermitRootLogin yes", in
20line with upstream. To avoid breaking local setups, this is still true for
21installations upgraded from before 1:6.6p1-1. If you wish to change this,
22you should edit /etc/ssh/sshd_config, change it manually, and run "service
23ssh restart" as root.
24
25Disabling PermitRootLogin means that an attacker possessing credentials for
26the root account (any credentials in the case of "yes", or private key
27material in the case of "prohibit-password") must compromise a normal user
28account rather than being able to SSH directly to root. Be careful to avoid
29a false illusion of security if you change this setting; any account you
30escalate to root from should be considered equivalent to root for the
31purposes of security against external attack. You might for example disable
32it if you know you will only ever log in as root from the physical console.
33
34Since the root account does not generally have non-password credentials
35unless you explicitly install an SSH public key in its
36~/.ssh/authorized_keys, which you presumably only do if you want to SSH to
37it, "prohibit-password" should be a reasonable default for most sites.
38
39As of OpenSSH 7.0, this is the upstream default.
40
41For further discussion, see:
42
43 https://bugs.debian.org/298138
44 https://bugzilla.mindrot.org/show_bug.cgi?id=2164
45
46X11 Forwarding
47--------------
48
49ssh's default for ForwardX11 has been changed to ``no'' because it has
50been pointed out that logging into remote systems administered by
51untrusted people is likely to open you up to X11 attacks, so you
52should have to actively decide that you trust the remote machine's
53root, before enabling X11. I strongly recommend that you do this on a
54machine-by-machine basis, rather than just enabling it in the default
55host settings.
56
57In order for X11 forwarding to work, you need to install xauth on the
58server. In Debian this is in the xbase-clients package.
59
60As of OpenSSH 3.1, the remote $DISPLAY uses localhost by default to reduce
61the security risks of X11 forwarding. Look up X11UseLocalhost in
62sshd_config(8) if this is a problem.
63
64OpenSSH 3.8 invented ForwardX11Trusted, which when set to no causes the
65ssh client to create an untrusted X cookie so that attacks on the
66forwarded X11 connection can't become attacks on X clients on the remote
67machine. However, this has some problems in implementation - notably a
68very short timeout of the untrusted cookie - breaks large numbers of
69existing setups, and generally seems immature. The Debian package
70therefore sets the default for this option to "yes" (in ssh itself,
71rather than in ssh_config).
72
73Fallback to RSH
74---------------
75
76The default for this setting has been changed from Yes to No, for
77security reasons, and to stop the delay attempting to rsh to machines
78that don't offer the service. Simply switch it back on in either
79/etc/ssh/ssh_config or ~/.ssh/config for those machines that you need
80it for.
81
82Setgid ssh-agent and environment variables
83------------------------------------------
84
85As of version 1:3.5p1-1, ssh-agent is installed setgid to prevent ptrace()
86attacks retrieving private key material. This has the side-effect of causing
87glibc to remove certain environment variables which might have security
88implications for set-id programs, including LD_PRELOAD, LD_LIBRARY_PATH, and
89TMPDIR.
90
91If you need to set any of these environment variables, you will need to do
92so in the program exec()ed by ssh-agent. This may involve creating a small
93wrapper script.
94
95Symlink Hostname invocation
96---------------------------
97
98This version of ssh no longer includes support for invoking ssh with the
99hostname as the name of the file run. People wanting this support should
100use the ssh-argv0 script.
101
102=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
103
104OTHER ISSUES
105============
106
107Authorization Forwarding
108------------------------
109
110Similarly, root on a remote server could make use of your ssh-agent
111(while you're logged into their machine) to obtain access to machines
112which trust your keys. This feature is therefore disabled by default.
113You should only re-enable it for those hosts (in your ~/.ssh/config or
114/etc/ssh/ssh_config) where you are confident that the remote machine
115is not a threat.
116
117Problems logging in with RSA authentication
118-------------------------------------------
119
120If you have trouble logging in with RSA authentication then the
121problem is probably caused by the fact that you have your home
122directory writable by group, as well as user (this is the default on
123Debian systems).
124
125Depending upon other settings on your system (i.e. other users being
126in your group) this could open a security hole, so you will need to
127make your home directory writable only by yourself. Run this command,
128as yourself:
129
130 chmod g-w ~/
131
132to remove group write permissions. If you use ssh-copy-id to install your
133keys, it does this for you.
134
135-L option of ssh nonfree
136------------------------
137
138non-free ssh supported the usage of the option -L to use a non privileged
139port for scp. This option will not be supported by scp from openssh.
140
141Please use instead scp -o "UsePrivilegedPort=no" as documented in the
142manpage to scp itself.
143
144Problem logging in because of TCP-Wrappers
145------------------------------------------
146
147ssh is compiled with support for tcp-wrappers. So if you can no longer
148log into your system, please check that /etc/hosts.allow and /etc/hosts.deny
149are configured so that ssh is not blocked.
150
151Kerberos support
152----------------
153
154ssh is now compiled with Kerberos support. Unfortunately, privilege
155separation is incompatible with parts of Kerberos support for protocol 2;
156you may need to run kinit after logging in.
157
158Interoperability between scp and the ssh.com SSH server
159-------------------------------------------------------
160
161In version 2 and greater of the commercial SSH server produced by SSH
162Communications Security, scp was changed to use SFTP (SSH2's file transfer
163protocol) instead of the traditional rcp-over-ssh, thereby breaking
164compatibility. The OpenSSH developers regard this as a bug in the ssh.com
165server, and do not currently intend to change OpenSSH's scp to match.
166
167Workarounds for this problem are to install scp1 on the server (scp2 will
168fall back to it), to use sftp, or to use some other transfer mechanism such
169as rsync-over-ssh or tar-over-ssh.
170
171Running sshd from inittab
172-------------------------
173
174Some people find it useful to run the sshd server from inittab, to make sure
175that it always stays running. To do this, stop sshd ('service ssh stop'),
176add the following line to /etc/inittab, and run 'telinit q':
177
178 ss:2345:respawn:/usr/sbin/sshd -D
179
180If you do this, note that you will need to stop sshd being started in the
181normal way ('update-rc.d ssh disable') and that you will need to restart
182this sshd manually on upgrades.
183
184Per-connection sshd instances with systemd
185------------------------------------------
186
187If you want to reconfigure systemd to listen on port 22 itself and launch an
188instance of sshd for each connection (inetd-style socket activation), then
189you can run:
190
191 systemctl stop ssh.service
192 systemctl start ssh.socket
193
194To make this permanent:
195
196 systemctl disable ssh.service
197 systemctl enable ssh.socket
198
199This may be appropriate in environments where minimal footprint is critical
200(e.g. cloud guests). Be aware that this bypasses MaxStartups, and systemd's
201MaxConnections cannot quite replace this as it cannot distinguish between
202authenticated and unauthenticated connections; see
203https://bugzilla.redhat.com/show_bug.cgi?id=963268 for more discussion.
204
205The provided ssh.socket unit file sets ListenStream=22. If you need to have
206it listen on a different address or port, then you will need to do this as
207follows (modifying ListenStream to match your requirements):
208
209 mkdir -p /etc/systemd/system/ssh.socket.d
210 cat >/etc/systemd/system/ssh.socket.d/listen.conf <<EOF
211 [Socket]
212 ListenStream=2222
213 EOF
214 systemctl daemon-reload
215
216See systemd.socket(5) for details.
217
218Terminating SSH sessions cleanly on shutdown/reboot with systemd
219----------------------------------------------------------------
220
221If you have libpam-systemd >= 230 installed (following openssh-server's
222Recommends) and "UsePAM yes" in sshd_config (the default configuration
223shipped by this package), then SSH sessions will be terminated cleanly when
224the server is shut down or rebooted.
225
226If either of these conditions does not hold, then you may find that SSH
227sessions hang silently when the server is shut down or rebooted. If you do
228not want to use PAM or configure it properly for whatever reason, then you
229can instead copy
230/usr/share/doc/openssh-server/examples/ssh-session-cleanup.service to
231/etc/systemd/system/ and run "systemctl enable ssh-session-cleanup.service".
232
233Non-systemd users may find /usr/lib/openssh/ssh-session-cleanup helpful if
234they have a similar problem, although at present there is no system
235integration for this for anything other than systemd.
236
237SSH protocol 1 server support removed
238-------------------------------------
239
240sshd(8) no longer supports the old SSH protocol 1, so all the configuration
241options related to it are now deprecated and should be removed from
242/etc/ssh/sshd_config. These are:
243
244 KeyRegenerationInterval
245 RSAAuthentication
246 RhostsRSAAuthentication
247 ServerKeyBits
248
249The Protocol option is also no longer needed, although it is silently
250ignored rather than deprecated.
251
252if-up hook removed
253------------------
254
255openssh-server previously shipped an if-up hook that restarted sshd when a
256network interface came up. This generally caused more problems than it
257solved: for instance, it means that sshd stops listening briefly while being
258restarted, which can cause problems in some environments, particularly
259automated tests.
260
261The only known situation where the if-up hook was useful was when
262sshd_config was changed to add ListenAddress entries for particular IP
263addresses, overriding the default of listening on all addresses, and the
264system is one that often roams between networks. In such a situation, it is
265better to remove ListenAddress entries from sshd_config (restoring it to the
266default behaviour) and instead use firewall rules to restrict incoming SSH
267connections to only the desired interfaces or addresses.
268
269For further discussion, see:
270
271 https://bugs.launchpad.net/bugs/1674330
272
273--
274Matthew Vernon <matthew@debian.org>
275Colin Watson <cjwatson@debian.org>
diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies
new file mode 100755
index 000000000..1cd7f2997
--- /dev/null
+++ b/debian/adjust-openssl-dependencies
@@ -0,0 +1,36 @@
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 if [ -e "$client_udeb" ]; then
29 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_udeb"
30 fi
31 if [ -e "$server_udeb" ]; then
32 sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server_udeb"
33 fi
34fi
35
36exit 0
diff --git a/debian/agent-launch b/debian/agent-launch
new file mode 100755
index 000000000..f3cbfaef8
--- /dev/null
+++ b/debian/agent-launch
@@ -0,0 +1,23 @@
1#!/bin/sh
2# helper script for launching ssh-agent, used by systemd unit
3set -e
4
5if [ ! -d "$XDG_RUNTIME_DIR" ]; then
6 echo 'This needs $XDG_RUNTIME_DIR to be set' >&2
7 exit 1
8fi
9
10if [ "$1" = start ]; then
11 if [ -z "$SSH_AUTH_SOCK" ] && grep -s -q '^use-ssh-agent$' /etc/X11/Xsession.options; then
12 S="$XDG_RUNTIME_DIR/openssh_agent"
13 dbus-update-activation-environment --verbose --systemd SSH_AUTH_SOCK=$S SSH_AGENT_LAUNCHER=openssh
14 exec ssh-agent -D -a $S
15 fi
16elif [ "$1" = stop ]; then
17 if [ "$SSH_AGENT_LAUNCHER" = openssh ]; then
18 dbus-update-activation-environment --systemd SSH_AUTH_SOCK=
19 fi
20else
21 echo "Unknown command $1" >&2
22 exit 1
23fi
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000000000..614b4e9cf
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5406 @@
1openssh (1:7.9p1-9) UNRELEASED; urgency=medium
2
3 * Apply upstream patch to make scp handle shell-style brace expansions
4 when checking that filenames sent by the server match what the client
5 requested (closes: #923486).
6
7 -- Colin Watson <cjwatson@debian.org> Fri, 01 Mar 2019 09:57:59 +0000
8
9openssh (1:7.9p1-8) unstable; urgency=medium
10
11 [ Colin Watson ]
12 * Apply upstream patch to fix bug in HostbasedAcceptedKeyTypes and
13 PubkeyAcceptedKeyTypes options in the case where only RSA-SHA2 signature
14 types were specified.
15 * Apply upstream patch to request RSA-SHA2 signatures for
16 rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms (closes:
17 #923419).
18 * Move moduli(5) manual page to openssh-server to go with /etc/ssh/moduli;
19 forgotten in 1:7.9p1-5.
20
21 [ Dominik George ]
22 * Correctly handle conffile move to openssh-server (closes: #919344).
23
24 -- Colin Watson <cjwatson@debian.org> Thu, 28 Feb 2019 19:31:49 +0000
25
26openssh (1:7.9p1-7) unstable; urgency=medium
27
28 * Recommend "default-logind | logind | libpam-systemd" rather than just
29 libpam-systemd (closes: #923199). (I've retained libpam-systemd as an
30 alternative for a while to avoid backporting accidents, although it can
31 be removed later.)
32 * Pass "--exec /usr/sbin/sshd" to start-stop-daemon on stop as well as
33 start and pass "--chuid 0:0" on start, to avoid problems with non-root
34 groups leaking into the ownership of /run/sshd.pid (closes: #922365).
35
36 -- Colin Watson <cjwatson@debian.org> Tue, 26 Feb 2019 15:13:23 +0000
37
38openssh (1:7.9p1-6) unstable; urgency=medium
39
40 * CVE-2019-6109: Apply upstream patches to sanitize scp filenames via
41 snmprintf (closes: #793412).
42 * CVE-2019-6111: Apply upstream patch to check in scp client that
43 filenames sent during remote->local directory copies satisfy the
44 wildcard specified by the user.
45
46 -- Colin Watson <cjwatson@debian.org> Fri, 08 Feb 2019 16:26:35 +0000
47
48openssh (1:7.9p1-5) unstable; urgency=high
49
50 * Move /etc/ssh/moduli to openssh-server, since it's reasonably large and
51 only used by sshd (closes: #858050).
52 * Drop obsolete alternate build-dependency on libssl1.0-dev (closes:
53 #917342).
54 * CVE-2018-20685: Apply upstream scp patch to disallow empty incoming
55 filename or ones that refer to the current directory (closes: #919101).
56
57 -- Colin Watson <cjwatson@debian.org> Sun, 13 Jan 2019 11:22:45 +0000
58
59openssh (1:7.9p1-4) unstable; urgency=medium
60
61 * Fix Ubuntu detection in debian/rules, since the documentation comment
62 for dpkg_vendor_derives_from is wrong (thanks, Jeremy Bicha; see
63 #913816).
64
65 -- Colin Watson <cjwatson@debian.org> Fri, 16 Nov 2018 11:27:28 +0000
66
67openssh (1:7.9p1-3) unstable; urgency=medium
68
69 * Be more specific about what files to install in openssh-tests, to avoid
70 installing a symlink into the build tree.
71 * Re-export debian/upstream/signing-key.asc without extra signatures.
72 * Restore direct test dependencies on openssl, putty-tools, and
73 python-twisted-conch; these are really only indirect dependencies via
74 openssh-tests, but including them means that this package will be
75 retested when they change.
76
77 -- Colin Watson <cjwatson@debian.org> Thu, 15 Nov 2018 01:30:56 +0000
78
79openssh (1:7.9p1-2) unstable; urgency=medium
80
81 * Add GitLab CI configuration.
82 * Make the autopkgtest create /run/sshd if it doesn't already exist.
83 * Drop "set -x" verbosity from the autopkgtest; I think we can do without
84 this in most cases nowadays.
85 * Add an openssh-tests binary package containing enough files to run the
86 upstream regression tests. This allows autopkgtest to run more
87 efficiently, as it doesn't have to build part of the source tree again.
88
89 -- Colin Watson <cjwatson@debian.org> Wed, 14 Nov 2018 15:55:48 +0000
90
91openssh (1:7.9p1-1) unstable; urgency=medium
92
93 * New upstream release (https://www.openssh.com/txt/release-7.9):
94 - ssh(1), sshd(8): allow most port numbers to be specified using service
95 names from getservbyname(3) (typically /etc/services; closes:
96 #177406).
97 - ssh(1): allow the IdentityAgent configuration directive to accept
98 environment variable names. This supports the use of multiple agent
99 sockets without needing to use fixed paths.
100 - sshd(8): support signalling sessions via the SSH protocol. A limited
101 subset of signals is supported and only for login or command sessions
102 (i.e. not subsystems) that were not subject to a forced command via
103 authorized_keys or sshd_config.
104 - ssh(1): support "ssh -Q sig" to list supported signature options.
105 Also "ssh -Q help" to show the full set of supported queries.
106 - ssh(1), sshd(8): add a CASignatureAlgorithms option for the client and
107 server configs to allow control over which signature formats are
108 allowed for CAs to sign certificates. For example, this allows
109 banning CAs that sign certificates using the RSA-SHA1 signature
110 algorithm.
111 - sshd(8), ssh-keygen(1): allow key revocation lists (KRLs) to revoke
112 keys specified by SHA256 hash.
113 - ssh-keygen(1): allow creation of key revocation lists directly from
114 base64-encoded SHA256 fingerprints. This supports revoking keys using
115 only the information contained in sshd(8) authentication log messages.
116 - ssh(1), ssh-keygen(1): avoid spurious "invalid format" errors when
117 attempting to load PEM private keys while using an incorrect
118 passphrase.
119 - sshd(8): when a channel closed message is received from a client,
120 close the stderr file descriptor at the same time stdout is closed.
121 This avoids stuck processes if they were waiting for stderr to close
122 and were insensitive to stdin/out closing (closes: #844494).
123 - ssh(1): allow ForwardX11Timeout=0 to disable the untrusted X11
124 forwarding timeout and support X11 forwarding indefinitely.
125 Previously the behaviour of ForwardX11Timeout=0 was undefined.
126 - sshd(8): when compiled with GSSAPI support, cache supported method
127 OIDs regardless of whether GSSAPI authentication is enabled in the
128 main section of sshd_config. This avoids sandbox violations if GSSAPI
129 authentication was later enabled in a Match block.
130 - sshd(8): do not fail closed when configured with a text key revocation
131 list that contains a too-short key.
132 - ssh(1): treat connections with ProxyJump specified the same as ones
133 with a ProxyCommand set with regards to hostname canonicalisation
134 (i.e. don't try to canonicalise the hostname unless
135 CanonicalizeHostname is set to 'always').
136 - ssh(1): fix regression in OpenSSH 7.8 that could prevent public-key
137 authentication using certificates hosted in a ssh-agent(1) or against
138 sshd(8) from OpenSSH <7.8 (LP: #1790963).
139 - All: support building against the openssl-1.1 API (releases 1.1.0g and
140 later). The openssl-1.0 API will remain supported at least until
141 OpenSSL terminates security patch support for that API version
142 (closes: #828475).
143 - sshd(8): allow the futex(2) syscall in the Linux seccomp sandbox;
144 apparently required by some glibc/OpenSSL combinations.
145 * Remove dh_builddeb override to use xz compression; this has been the
146 default since dpkg 1.17.0.
147 * Simplify debian/rules using /usr/share/dpkg/default.mk.
148 * Remove /etc/network/if-up.d/openssh-server, as it causes more problems
149 than it solves (thanks, Christian Ehrhardt, Andreas Hasenack, and David
150 Britton; closes: #789532, LP: #1037738, #1674330, #1718227). Add an
151 "if-up hook removed" section to README.Debian documenting the corner
152 case that may need configuration adjustments.
153
154 -- Colin Watson <cjwatson@debian.org> Sun, 21 Oct 2018 10:39:24 +0100
155
156openssh (1:7.8p1-1) unstable; urgency=medium
157
158 * New upstream release (https://www.openssh.com/txt/release-7.8, closes:
159 #907534):
160 - ssh-keygen(1): Write OpenSSH format private keys by default instead of
161 using OpenSSL's PEM format (closes: #905407). The OpenSSH format,
162 supported in OpenSSH releases since 2014 and described in the
163 PROTOCOL.key file in the source distribution, offers substantially
164 better protection against offline password guessing and supports key
165 comments in private keys. If necessary, it is possible to write old
166 PEM-style keys by adding "-m PEM" to ssh-keygen's arguments when
167 generating or updating a key.
168 - sshd(8): Remove internal support for S/Key multiple factor
169 authentication. S/Key may still be used via PAM or BSD auth.
170 - ssh(1): Remove vestigial support for running ssh(1) as setuid. This
171 used to be required for hostbased authentication and the (long gone)
172 rhosts-style authentication, but has not been necessary for a long
173 time. Attempting to execute ssh as a setuid binary, or with uid !=
174 effective uid will now yield a fatal error at runtime.
175 - sshd(8): The semantics of PubkeyAcceptedKeyTypes and the similar
176 HostbasedAcceptedKeyTypes options have changed. These now specify
177 signature algorithms that are accepted for their respective
178 authentication mechanism, where previously they specified accepted key
179 types. This distinction matters when using the RSA/SHA2 signature
180 algorithms "rsa-sha2-256", "rsa-sha2-512" and their certificate
181 counterparts. Configurations that override these options but omit
182 these algorithm names may cause unexpected authentication failures (no
183 action is required for configurations that accept the default for
184 these options).
185 - sshd(8): The precedence of session environment variables has changed.
186 ~/.ssh/environment and environment="..." options in authorized_keys
187 files can no longer override SSH_* variables set implicitly by sshd.
188 - ssh(1)/sshd(8): The default IPQoS used by ssh/sshd has changed. They
189 will now use DSCP AF21 for interactive traffic and CS1 for bulk. For
190 a detailed rationale, please see the commit message:
191 https://cvsweb.openbsd.org/src/usr.bin/ssh/readconf.c#rev1.284
192 - ssh(1)/sshd(8): Add new signature algorithms "rsa-sha2-256-cert-
193 v01@openssh.com" and "rsa-sha2-512-cert-v01@openssh.com" to explicitly
194 force use of RSA/SHA2 signatures in authentication.
195 - sshd(8): Extend the PermitUserEnvironment option to accept a whitelist
196 of environment variable names in addition to global "yes" or "no"
197 settings.
198 - sshd(8): Add a PermitListen directive to sshd_config(5) and a
199 corresponding permitlisten= authorized_keys option that control which
200 listen addresses and port numbers may be used by remote forwarding
201 (ssh -R ...).
202 - sshd(8): Add some countermeasures against timing attacks used for
203 account validation/enumeration. sshd will enforce a minimum time or
204 each failed authentication attempt consisting of a global 5ms minimum
205 plus an additional per-user 0-4ms delay derived from a host secret.
206 - sshd(8): Add a SetEnv directive to allow an administrator to
207 explicitly specify environment variables in sshd_config. Variables
208 set by SetEnv override the default and client-specified environment.
209 - ssh(1): Add a SetEnv directive to request that the server sets an
210 environment variable in the session. Similar to the existing SendEnv
211 option, these variables are set subject to server configuration.
212 - ssh(1): Allow "SendEnv -PATTERN" to clear environment variables
213 previously marked for sending to the server (closes: #573316).
214 - ssh(1)/sshd(8): Make UID available as a %-expansion everywhere that
215 the username is available currently.
216 - ssh(1): Allow setting ProxyJump=none to disable ProxyJump
217 functionality.
218 - sshd(8): Avoid observable differences in request parsing that could be
219 used to determine whether a target user is valid.
220 - ssh(1)/sshd(8): Fix some memory leaks.
221 - ssh(1): Fix a pwent clobber (introduced in openssh-7.7) that could
222 occur during key loading, manifesting as crash on some platforms.
223 - sshd_config(5): Clarify documentation for AuthenticationMethods
224 option.
225 - ssh(1): Ensure that the public key algorithm sent in a public key
226 SSH_MSG_USERAUTH_REQUEST matches the content of the signature blob.
227 Previously, these could be inconsistent when a legacy or non-OpenSSH
228 ssh-agent returned a RSA/SHA1 signature when asked to make a RSA/SHA2
229 signature.
230 - sshd(8): Fix failures to read authorized_keys caused by faulty
231 supplemental group caching.
232 - scp(1): Apply umask to directories, fixing potential mkdir/chmod race
233 when copying directory trees.
234 - ssh-keygen(1): Return correct exit code when searching for and hashing
235 known_hosts entries in a single operation.
236 - ssh(1): Prefer the ssh binary pointed to via argv[0] to $PATH when
237 re-executing ssh for ProxyJump.
238 - sshd(8): Do not ban PTY allocation when a sshd session is restricted
239 because the user password is expired as it breaks password change
240 dialog.
241 - ssh(1)/sshd(8): Fix error reporting from select() failures.
242 - ssh(1): Improve documentation for -w (tunnel) flag, emphasising that
243 -w implicitly sets Tunnel=point-to-point.
244 - ssh-agent(1): Implement EMFILE mitigation for ssh-agent. ssh-agent
245 will no longer spin when its file descriptor limit is exceeded.
246 - ssh(1)/sshd(8): Disable SSH2_MSG_DEBUG messages for Twisted Conch
247 clients. Twisted Conch versions that lack a version number in their
248 identification strings will mishandle these messages when running on
249 Python 2.x (https://twistedmatrix.com/trac/ticket/9422).
250 - sftp(1): Notify user immediately when underlying ssh process dies
251 expectedly.
252 - ssh(1)/sshd(8): Fix tunnel forwarding; regression in 7.7 release.
253 - ssh-agent(1): Don't kill ssh-agent's listening socket entirely if it
254 fails to accept(2) a connection.
255 - ssh(1): Add some missing options in the configuration dump output (ssh
256 -G).
257 - sshd(8): Expose details of completed authentication to PAM auth
258 modules via SSH_AUTH_INFO_0 in the PAM environment.
259 * Switch debian/watch to HTTPS.
260 * Temporarily work around https://twistedmatrix.com/trac/ticket/9515 in
261 regression tests.
262
263 -- Colin Watson <cjwatson@debian.org> Thu, 30 Aug 2018 15:35:27 +0100
264
265openssh (1:7.7p1-4) unstable; urgency=high
266
267 * CVE-2018-15473: Apply upstream patch to delay bailout for invalid
268 authenticating user until after the packet containing the request has
269 been fully parsed (closes: #906236).
270
271 -- Colin Watson <cjwatson@debian.org> Fri, 17 Aug 2018 14:09:32 +0100
272
273openssh (1:7.7p1-3) unstable; urgency=medium
274
275 [ Colin Watson ]
276 * Adjust git-dpm tagging configuration.
277 * Remove no-longer-used Lintian overrides from openssh-server and ssh.
278 * Add Documentation keys to ssh-agent.service, ssh.service, and
279 ssh@.service.
280
281 [ Juri Grabowski ]
282 * Add rescue.target with ssh support.
283
284 [ Christian Ehrhardt ]
285 * Fix unintentional restriction of authorized keys environment options
286 to be alphanumeric (closes: #903474, LP: #1771011).
287
288 -- Colin Watson <cjwatson@debian.org> Tue, 10 Jul 2018 16:07:16 +0100
289
290openssh (1:7.7p1-2) unstable; urgency=medium
291
292 * Fix parsing of DebianBanner option (closes: #894730).
293
294 -- Colin Watson <cjwatson@debian.org> Wed, 04 Apr 2018 00:47:29 +0100
295
296openssh (1:7.7p1-1) unstable; urgency=medium
297
298 * New upstream release (https://www.openssh.com/txt/release-7.7):
299 - ssh(1)/sshd(8): Drop compatibility support for some very old SSH
300 implementations, including ssh.com <=2.* and OpenSSH <= 3.*. These
301 versions were all released in or before 2001 and predate the final SSH
302 RFCs. The support in question isn't necessary for RFC-compliant SSH
303 implementations.
304 - Add experimental support for PQC XMSS keys (Extended Hash-Based
305 Signatures).
306 - sshd(8): Add an "rdomain" criterion for the sshd_config Match keyword
307 to allow conditional configuration that depends on which routing
308 domain a connection was received on.
309 - sshd_config(5): Add an optional rdomain qualifier to the ListenAddress
310 directive to allow listening on different routing domains.
311 - sshd(8): Add "expiry-time" option for authorized_keys files to allow
312 for expiring keys.
313 - ssh(1): Add a BindInterface option to allow binding the outgoing
314 connection to an interface's address (basically a more usable
315 BindAddress; closes: #289592).
316 - ssh(1): Expose device allocated for tun/tap forwarding via a new %T
317 expansion for LocalCommand. This allows LocalCommand to be used to
318 prepare the interface.
319 - sshd(8): Expose the device allocated for tun/tap forwarding via a new
320 SSH_TUNNEL environment variable. This allows automatic setup of the
321 interface and surrounding network configuration automatically on the
322 server.
323 - ssh(1)/scp(1)/sftp(1): Add URI support to ssh, sftp and scp, e.g.
324 ssh://user@host or sftp://user@host/path. Additional connection
325 parameters described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not
326 implemented since the ssh fingerprint format in the draft uses the
327 deprecated MD5 hash with no way to specify any other algorithm.
328 - ssh-keygen(1): Allow certificate validity intervals that specify only
329 a start or stop time (instead of both or neither).
330 - sftp(1): Allow "cd" and "lcd" commands with no explicit path argument.
331 lcd will change to the local user's home directory as usual. cd will
332 change to the starting directory for session (because the protocol
333 offers no way to obtain the remote user's home directory).
334 - sshd(8): When doing a config test with sshd -T, only require the
335 attributes that are actually used in Match criteria rather than (an
336 incomplete list of) all criteria.
337 - ssh(1)/sshd(8): More strictly check signature types during key
338 exchange against what was negotiated. Prevents downgrade of RSA
339 signatures made with SHA-256/512 to SHA-1.
340 - sshd(8): Fix support for client that advertise a protocol version of
341 "1.99" (indicating that they are prepared to accept both SSHv1 and
342 SSHv2). This was broken in OpenSSH 7.6 during the removal of SSHv1
343 support.
344 - ssh(1): Warn when the agent returns a ssh-rsa (SHA1) signature when a
345 rsa-sha2-256/512 signature was requested. This condition is possible
346 when an old or non-OpenSSH agent is in use.
347 - ssh-agent(1): Fix regression introduced in 7.6 that caused ssh-agent
348 to fatally exit if presented an invalid signature request message.
349 - sshd_config(5): Accept yes/no flag options case-insensitively, as has
350 been the case in ssh_config(5) for a long time (LP: #1656557).
351 - ssh(1): Improve error reporting for failures during connection. Under
352 some circumstances misleading errors were being shown.
353 - ssh-keyscan(1): Add -D option to allow printing of results directly in
354 SSHFP format.
355 - ssh(1): Compatibility fix for some servers that erroneously drop the
356 connection when the IUTF8 (RFC8160) option is sent.
357 - scp(1): Disable RemoteCommand and RequestTTY in the ssh session
358 started by scp (sftp was already doing this).
359 - ssh-keygen(1): Refuse to create a certificate with an unusable number
360 of principals.
361 - ssh-keygen(1): Fatally exit if ssh-keygen is unable to write all the
362 public key during key generation. Previously it would silently ignore
363 errors writing the comment and terminating newline.
364 - ssh(1): Do not modify hostname arguments that are addresses by
365 automatically forcing them to lower-case. Instead canonicalise them
366 jo resolve ambiguities (e.g. ::0001 => ::1) before they are matched
367 against known_hosts.
368 - ssh(1): Don't accept junk after "yes" or "no" responses to hostkey
369 prompts.
370 - sftp(1): Have sftp print a warning about shell cleanliness when
371 decoding the first packet fails, which is usually caused by shells
372 polluting stdout of non-interactive startups.
373 - ssh(1)/sshd(8): Switch timers in packet code from using wall-clock
374 time to monotonic time, allowing the packet layer to better function
375 over a clock step and avoiding possible integer overflows during
376 steps.
377 - sshd(8): Correctly detect MIPS ABI in use at configure time. Fixes
378 sandbox violations on some environments.
379 - Build and link with "retpoline" flags when available to mitigate the
380 "branch target injection" style (variant 2) of the Spectre
381 branch-prediction vulnerability.
382
383 -- Colin Watson <cjwatson@debian.org> Tue, 03 Apr 2018 12:40:24 +0100
384
385openssh (1:7.6p1-5) unstable; urgency=medium
386
387 * Explicitly build-depend on pkg-config, rather than implicitly
388 build-depending on it via libgtk-3-dev (thanks, Aurelien Jarno; closes:
389 #894558).
390
391 -- Colin Watson <cjwatson@debian.org> Sun, 01 Apr 2018 21:37:19 +0100
392
393openssh (1:7.6p1-4) unstable; urgency=medium
394
395 * Move VCS to salsa.debian.org.
396 * Add a preseeding-only openssh-server/password-authentication debconf
397 template that can be used to disable password authentication (closes:
398 #878945).
399
400 -- Colin Watson <cjwatson@debian.org> Sat, 10 Feb 2018 02:31:46 +0000
401
402openssh (1:7.6p1-3) unstable; urgency=medium
403
404 [ Colin Watson ]
405 * Remove the decade-old ssh-krb5 transitional package; upgrades of
406 openssh-server will preserve existing configuration, and new
407 installations should just enable GSSAPIAuthentication and
408 GSSAPIKeyExchange in sshd_config (closes: #878626).
409 * Support the "noudeb" build profile.
410 * Fix putty-transfer regression test.
411
412 [ Anders Kaseorg ]
413 * debian/systemd/ssh-agent.service: Add missing dbus dependency.
414
415 [ Jason Duerstock ]
416 * Add a "pkg.openssh.nognome" build profile, which disables building the
417 ssh-askpass-gnome binary package and avoids the build-dependency on
418 libgtk-3-dev (closes: #883819).
419
420 -- Colin Watson <cjwatson@debian.org> Tue, 16 Jan 2018 17:41:08 +0000
421
422openssh (1:7.6p1-2) unstable; urgency=medium
423
424 * Apply upstream patch to fix PermitOpen argument handling.
425
426 -- Colin Watson <cjwatson@debian.org> Sat, 07 Oct 2017 13:44:13 +0100
427
428openssh (1:7.6p1-1) unstable; urgency=medium
429
430 * New upstream release (https://www.openssh.com/txt/release-7.6):
431 - CVE-2017-15906: sftp-server(8): In read-only mode, sftp-server was
432 incorrectly permitting creation of zero-length files. Reported by
433 Michal Zalewski.
434 - ssh(1): Delete SSH protocol version 1 support, associated
435 configuration options and documentation (LP: #1584321).
436 - ssh(1)/sshd(8): Remove support for the hmac-ripemd160 MAC.
437 - ssh(1)/sshd(8): Remove support for the arcfour, blowfish and CAST
438 ciphers.
439 - Refuse RSA keys <1024 bits in length and improve reporting for keys
440 that do not meet this requirement.
441 - ssh(1): Do not offer CBC ciphers by default.
442 - ssh(1): Add RemoteCommand option to specify a command in the ssh
443 config file instead of giving it on the client's command line. This
444 allows the configuration file to specify the command that will be
445 executed on the remote host.
446 - sshd(8): Add ExposeAuthInfo option that enables writing details of the
447 authentication methods used (including public keys where applicable)
448 to a file that is exposed via a $SSH_USER_AUTH environment variable in
449 the subsequent session.
450 - ssh(1): Add support for reverse dynamic forwarding. In this mode, ssh
451 will act as a SOCKS4/5 proxy and forward connections to destinations
452 requested by the remote SOCKS client. This mode is requested using
453 extended syntax for the -R and RemoteForward options and, because it
454 is implemented solely at the client, does not require the server be
455 updated to be supported.
456 - sshd(8): Allow LogLevel directive in sshd_config Match blocks.
457 - ssh-keygen(1): Allow inclusion of arbitrary string or flag certificate
458 extensions and critical options.
459 - ssh-keygen(1): Allow ssh-keygen to use a key held in ssh-agent as a CA
460 when signing certificates.
461 - ssh(1)/sshd(8): Allow IPQoS=none in ssh/sshd to not set an explicit
462 ToS/DSCP value and just use the operating system default.
463 - ssh-add(1): Add -q option to make ssh-add quiet on success.
464 - ssh(1): Expand the StrictHostKeyChecking option with two new settings.
465 The first "accept-new" will automatically accept hitherto-unseen keys
466 but will refuse connections for changed or invalid hostkeys. This is
467 a safer subset of the current behaviour of StrictHostKeyChecking=no.
468 The second setting "off", is a synonym for the current behaviour of
469 StrictHostKeyChecking=no: accept new host keys, and continue
470 connection for hosts with incorrect hostkeys. A future release will
471 change the meaning of StrictHostKeyChecking=no to the behaviour of
472 "accept-new".
473 - ssh(1): Add SyslogFacility option to ssh(1) matching the equivalent
474 option in sshd(8).
475 - ssh(1): Use HostKeyAlias if specified instead of hostname for matching
476 host certificate principal names.
477 - sftp(1): Implement sorting for globbed ls.
478 - ssh(1): Add a user@host prefix to client's "Permission denied"
479 messages, useful in particular when using "stacked" connections (e.g.
480 ssh -J) where it's not clear which host is denying.
481 - ssh(1): Accept unknown EXT_INFO extension values that contain \0
482 characters. These are legal, but would previously cause fatal
483 connection errors if received.
484 - sftp(1): Print '?' instead of incorrect link count (that the protocol
485 doesn't provide) for remote listings.
486 - ssh(1): Return failure rather than fatal() for more cases during
487 session multiplexing negotiations. Causes the session to fall back to
488 a non-mux connection if they occur.
489 - ssh(1): Mention that the server may send debug messages to explain
490 public key authentication problems under some circumstances.
491 - Translate OpenSSL error codes to better report incorrect passphrase
492 errors when loading private keys.
493 - sshd(8): Adjust compatibility patterns for WinSCP to correctly
494 identify versions that implement only the legacy DH group exchange
495 scheme (closes: #877800).
496 - ssh(1): Print the "Killed by signal 1" message only at LogLevel
497 verbose so that it is not shown at the default level; prevents it from
498 appearing during ssh -J and equivalent ProxyCommand configs.
499 - ssh-keygen(1): When generating all hostkeys (ssh-keygen -A), clobber
500 existing keys if they exist but are zero length. Zero-length keys
501 could previously be made if ssh-keygen failed or was interrupted part
502 way through generating them.
503 - ssh-keyscan(1): Avoid double-close() on file descriptors.
504 - sshd(8): Avoid reliance on shared use of pointers shared between
505 monitor and child sshd processes.
506 - sshd_config(8): Document available AuthenticationMethods.
507 - ssh(1): Avoid truncation in some login prompts.
508 - ssh(1): Make "--" before the hostname terminate argument processing
509 after the hostname too (closes: #873201).
510 - ssh-keygen(1): Switch from aes256-cbc to aes256-ctr for encrypting
511 new-style private keys.
512 - ssh(1): Warn and do not attempt to use keys when the public and
513 private halves do not match.
514 - sftp(1): Don't print verbose error message when ssh disconnects from
515 under sftp.
516 - sshd(8): Fix keepalive scheduling problem: prevent activity on a
517 forwarded port from preventing the keepalive from being sent.
518 - sshd(8): When started without root privileges, don't require the
519 privilege separation user or path to exist.
520 - ssh(1)/sshd(8): Correctness fix for channels implementation: accept
521 channel IDs greater than 0x7FFFFFFF.
522 - sshd(8): Expose list of completed authentication methods to PAM via
523 the SSH_AUTH_INFO_0 PAM environment variable.
524 - ssh(1)/sshd(8): Fix several problems in the tun/tap forwarding code,
525 mostly to do with host/network byte order confusion.
526 - sshd(8): Avoid Linux seccomp violations on ppc64le over the socketcall
527 syscall.
528 * Build-depend on debhelper (>= 9.20160709~) rather than dh-systemd.
529 * Change priorities of ssh and ssh-krb5 binary packages to optional, since
530 "Priority: extra" is now deprecated.
531 * Use HTTPS form of copyright-format URL.
532 * Adjust "Running sshd from inittab" instructions in README.Debian to
533 recommend using service(8) rather than calling the init script directly.
534 * Policy version 4.1.0.
535 * Adjust "Per-connection sshd instances with systemd" instructions in
536 README.Debian to recommend using a drop-in file rather than copying and
537 modifying the ssh.socket unit file.
538
539 -- Colin Watson <cjwatson@debian.org> Fri, 06 Oct 2017 12:36:48 +0100
540
541openssh (1:7.5p1-10) unstable; urgency=medium
542
543 * Tell haveged to create the pid file we expect.
544 * Give up and use systemctl to start haveged if running under systemd;
545 this shouldn't be necessary, but I can't seem to get things working in
546 the Ubuntu autopkgtest environment otherwise.
547
548 -- Colin Watson <cjwatson@debian.org> Fri, 01 Sep 2017 11:17:19 +0100
549
550openssh (1:7.5p1-9) unstable; urgency=medium
551
552 * Run debian/tests/regress with "set -x".
553 * Run haveged without "-w 1024", as setting the low water mark doesn't
554 seem possible in all autopkgtest virtualisation environments.
555
556 -- Colin Watson <cjwatson@debian.org> Thu, 31 Aug 2017 13:23:04 +0100
557
558openssh (1:7.5p1-8) unstable; urgency=medium
559
560 * Drop openssh-client-ssh1, now built by a separate source package.
561 * Run haveged during autopkgtests to ensure that they have enough entropy
562 for key generation (LP: #1712921).
563 * Apply patches from https://bugzilla.mindrot.org/show_bug.cgi?id=2752 to
564 allow some extra syscalls for crypto cards on s390x (LP: #1686618).
565
566 -- Colin Watson <cjwatson@debian.org> Mon, 28 Aug 2017 12:16:35 +0100
567
568openssh (1:7.5p1-7) unstable; urgency=medium
569
570 * Fix spelling of RuntimeDirectoryMode (closes: #872976).
571 * Add RuntimeDirectory and RuntimeDirectoryMode to ssh@.service as well as
572 ssh.service (closes: #872978).
573
574 -- Colin Watson <cjwatson@debian.org> Wed, 23 Aug 2017 12:12:59 +0100
575
576openssh (1:7.5p1-6) unstable; urgency=medium
577
578 [ Colin Watson ]
579 * Test configuration before starting or reloading sshd under systemd
580 (closes: #865770).
581 * Create /run/sshd under systemd using RuntimeDirectory rather than
582 tmpfiles.d (thanks, Dmitry Smirnov; closes: #864190).
583
584 [ Dimitri John Ledkov ]
585 * Drop upstart system and user jobs (closes: #872851).
586
587 [ Chris Lamb ]
588 * Quote IP address in suggested "ssh-keygen -f" calls (closes: #872643).
589
590 -- Colin Watson <cjwatson@debian.org> Wed, 23 Aug 2017 01:41:06 +0100
591
592openssh (1:7.5p1-5) unstable; urgency=medium
593
594 * Upload to unstable.
595 * Fix syntax error in debian/copyright.
596
597 -- Colin Watson <cjwatson@debian.org> Sun, 18 Jun 2017 12:08:42 +0100
598
599openssh (1:7.5p1-4) experimental; urgency=medium
600
601 * Drop README.Debian section on privilege separation, as it's no longer
602 optional.
603 * Only call "initctl set-env" from agent-launch if $UPSTART_SESSION is set
604 (LP: #1689299).
605 * Fix incoming compression statistics (thanks, Russell Coker; closes:
606 #797964).
607 * Relicense debian/* under a two-clause BSD licence for bidirectional
608 compatibility with upstream, with permission from Matthew Vernon and
609 others.
610
611 -- Colin Watson <cjwatson@debian.org> Tue, 06 Jun 2017 15:17:58 +0100
612
613openssh (1:7.5p1-3) experimental; urgency=medium
614
615 * Fix debian/adjust-openssl-dependencies to account for preferring
616 libssl1.0-dev.
617 * Adjust OpenSSL dependencies for openssh-client-ssh1 too.
618 * Fix purge failure when /etc/ssh has already somehow been removed
619 (LP: #1682817).
620 * Ensure that /etc/ssh exists before trying to create /etc/ssh/sshd_config
621 (LP: #1685022).
622
623 -- Colin Watson <cjwatson@debian.org> Tue, 02 May 2017 13:51:27 +0100
624
625openssh (1:7.5p1-2) experimental; urgency=medium
626
627 * Add missing header on Linux/s390.
628 * Fix syntax error on Linux/X32.
629
630 -- Colin Watson <cjwatson@debian.org> Sun, 02 Apr 2017 13:20:11 +0100
631
632openssh (1:7.5p1-1) experimental; urgency=medium
633
634 * New upstream release (https://www.openssh.com/txt/release-7.5):
635 - SECURITY: ssh(1), sshd(8): Fix weakness in CBC padding oracle
636 countermeasures that allowed a variant of the attack fixed in OpenSSH
637 7.3 to proceed. Note that the OpenSSH client disables CBC ciphers by
638 default, sshd offers them as lowest-preference options and will remove
639 them by default entirely in the next release.
640 - This release deprecates the sshd_config UsePrivilegeSeparation option,
641 thereby making privilege separation mandatory (closes: #407754).
642 - The format of several log messages emitted by the packet code has
643 changed to include additional information about the user and their
644 authentication state. Software that monitors ssh/sshd logs may need
645 to account for these changes.
646 - ssh(1), sshd(8): Support "=-" syntax to easily remove methods from
647 algorithm lists, e.g. Ciphers=-*cbc.
648 - sshd(1): Fix NULL dereference crash when key exchange start messages
649 are sent out of sequence.
650 - ssh(1), sshd(8): Allow form-feed characters to appear in configuration
651 files.
652 - sshd(8): Fix regression in OpenSSH 7.4 support for the server-sig-algs
653 extension, where SHA2 RSA signature methods were not being correctly
654 advertised.
655 - ssh(1), ssh-keygen(1): Fix a number of case-sensitivity bugs in
656 known_hosts processing.
657 - ssh(1): Allow ssh to use certificates accompanied by a private key
658 file but no corresponding plain *.pub public key.
659 - ssh(1): When updating hostkeys using the UpdateHostKeys option, accept
660 RSA keys if HostkeyAlgorithms contains any RSA keytype. Previously,
661 ssh could ignore RSA keys when only the ssh-rsa-sha2-* methods were
662 enabled in HostkeyAlgorithms and not the old ssh-rsa method.
663 - ssh(1): Detect and report excessively long configuration file lines.
664 - Merge a number of fixes found by Coverity and reported via Redhat and
665 FreeBSD. Includes fixes for some memory and file descriptor leaks in
666 error paths.
667 - ssh(1), sshd(8): When logging long messages to stderr, don't truncate
668 "\r\n" if the length of the message exceeds the buffer.
669 - ssh(1): Fully quote [host]:port in generated ProxyJump/-J command-
670 line; avoid confusion over IPv6 addresses and shells that treat square
671 bracket characters specially.
672 - Fix various fallout and sharp edges caused by removing SSH protocol 1
673 support from the server, including the server banner string being
674 incorrectly terminated with only \n (instead of \r\n), confusing error
675 messages from ssh-keyscan, and a segfault in sshd if protocol v.1 was
676 enabled for the client and sshd_config contained references to legacy
677 keys.
678 - ssh(1), sshd(8): Free fd_set on connection timeout.
679 - sftp(1): Fix division by zero crash in "df" output when server returns
680 zero total filesystem blocks/inodes.
681 - ssh(1), ssh-add(1), ssh-keygen(1), sshd(8): Translate OpenSSL errors
682 encountered during key loading to more meaningful error codes.
683 - ssh-keygen(1): Sanitise escape sequences in key comments sent to
684 printf but preserve valid UTF-8 when the locale supports it.
685 - ssh(1), sshd(8): Return reason for port forwarding failures where
686 feasible rather than always "administratively prohibited".
687 - sshd(8): Fix deadlock when AuthorizedKeysCommand or
688 AuthorizedPrincipalsCommand produces a lot of output and a key is
689 matched early.
690 - ssh(1): Fix typo in ~C error message for bad port forward
691 cancellation.
692 - ssh(1): Show a useful error message when included config files can't
693 be opened.
694 - sshd_config(5): Repair accidentally-deleted mention of %k token in
695 AuthorizedKeysCommand.
696 - sshd(8): Remove vestiges of previously removed LOGIN_PROGRAM.
697 - ssh-agent(1): Relax PKCS#11 whitelist to include libexec and common
698 32-bit compatibility library directories.
699 - sftp-client(1): Fix non-exploitable integer overflow in SSH2_FXP_NAME
700 response handling.
701 - ssh-agent(1): Fix regression in 7.4 of deleting PKCS#11-hosted keys.
702 It was not possible to delete them except by specifying their full
703 physical path.
704 - sshd(8): Avoid sandbox errors for Linux S390 systems using an ICA
705 crypto coprocessor.
706 - sshd(8): Fix non-exploitable weakness in seccomp-bpf sandbox arg
707 inspection.
708 - ssh-keygen(1), ssh(1), sftp(1): Fix output truncation for various that
709 contain non-printable characters where the codeset in use is ASCII.
710
711 -- Colin Watson <cjwatson@debian.org> Sun, 02 Apr 2017 02:58:01 +0100
712
713openssh (1:7.4p1-11) unstable; urgency=medium
714
715 * Fix incoming compression statistics (thanks, Russell Coker; closes:
716 #797964).
717
718 -- Colin Watson <cjwatson@debian.org> Tue, 06 Jun 2017 15:03:48 +0100
719
720openssh (1:7.4p1-10) unstable; urgency=medium
721
722 * Move privilege separation directory and PID file from /var/run/ to /run/
723 (closes: #760422, #856825).
724 * Unbreak Unix domain socket forwarding for root (closes: #858252).
725
726 -- Colin Watson <cjwatson@debian.org> Thu, 30 Mar 2017 11:19:04 +0100
727
728openssh (1:7.4p1-9) unstable; urgency=medium
729
730 * Fix null pointer dereference in ssh-keygen; this fixes an autopkgtest
731 regression introduced in 1:7.4p1-8.
732
733 -- Colin Watson <cjwatson@debian.org> Thu, 16 Mar 2017 13:43:15 +0000
734
735openssh (1:7.4p1-8) unstable; urgency=medium
736
737 * Fix ssh-keygen -H accidentally corrupting known_hosts that contained
738 already-hashed entries (closes: #851734, LP: #1668093).
739 * Fix ssh-keyscan to correctly hash hosts with a port number (closes:
740 #857736, LP: #1670745).
741
742 -- Colin Watson <cjwatson@debian.org> Tue, 14 Mar 2017 13:49:14 +0000
743
744openssh (1:7.4p1-7) unstable; urgency=medium
745
746 * Don't set "PermitRootLogin yes" on fresh installations (regression
747 introduced in 1:7.4p1-1; closes: #852781).
748 * Restore reading authorized_keys2 by default. Upstream seems to intend
749 to gradually phase this out, so don't assume that this will remain the
750 default forever. However, we were late in adopting the upstream
751 sshd_config changes, so it makes sense to extend the grace period
752 (closes: #852320).
753
754 -- Colin Watson <cjwatson@debian.org> Sun, 05 Mar 2017 02:12:42 +0000
755
756openssh (1:7.4p1-6) unstable; urgency=medium
757
758 * Remove temporary file on exit from postinst (closes: #850275).
759 * Remove LOGIN_PROGRAM and LOGIN_NO_ENDOPT definitions, since UseLogin is
760 gone.
761 * Document sshd_config changes that may be needed following the removal of
762 protocol 1 support from sshd (closes: #851573).
763 * Remove ssh_host_dsa_key from HostKey default (closes: #850614).
764 * Fix rekeying failure with GSSAPI key exchange (thanks, Harald Barth;
765 closes: #819361, LP: #1608965).
766
767 -- Colin Watson <cjwatson@debian.org> Mon, 16 Jan 2017 15:11:10 +0000
768
769openssh (1:7.4p1-5) unstable; urgency=medium
770
771 * Create mux socket for regression tests in a temporary directory.
772 * Work around clock_gettime kernel bug on Linux x32 (closes: #849923).
773
774 -- Colin Watson <cjwatson@debian.org> Tue, 03 Jan 2017 14:43:28 +0000
775
776openssh (1:7.4p1-4) unstable; urgency=medium
777
778 * Run regression tests inside annotate-output to try to diagnose timeout
779 issues.
780 * Make integrity tests more robust against timeouts in the case where the
781 first test in a series for a given MAC happens to modify the low bytes
782 of a packet length.
783 * Fix race conditions in forwarding tests.
784
785 -- Colin Watson <cjwatson@debian.org> Mon, 02 Jan 2017 19:37:23 +0000
786
787openssh (1:7.4p1-3) unstable; urgency=medium
788
789 * Revert attempted hack around regress/forwarding.sh test failure, since
790 it doesn't seem to help.
791 * Run regression tests using 'sh -x' to try to get more information about
792 failures.
793 * Dump some useful log files if regression tests fail.
794 * Tweak regression test setup to cope with the case where some of the
795 source directory is unreadable by the openssh-tests user.
796
797 -- Colin Watson <cjwatson@debian.org> Sat, 31 Dec 2016 02:48:17 +0000
798
799openssh (1:7.4p1-2) unstable; urgency=medium
800
801 * Attempt to hack around regress/forwarding.sh test failure in some
802 environments.
803 * Avoid calling into Kerberos libraries from ssh_gssapi_server_mechanisms
804 in the privsep monitor.
805
806 -- Colin Watson <cjwatson@debian.org> Thu, 29 Dec 2016 12:02:12 +0000
807
808openssh (1:7.4p1-1) unstable; urgency=medium
809
810 * New upstream release (http://www.openssh.com/txt/release-7.4):
811 - ssh(1): Remove 3des-cbc from the client's default proposal. 64-bit
812 block ciphers are not safe in 2016 and we don't want to wait until
813 attacks like SWEET32 are extended to SSH. As 3des-cbc was the only
814 mandatory cipher in the SSH RFCs, this may cause problems connecting
815 to older devices using the default configuration, but it's highly
816 likely that such devices already need explicit configuration for key
817 exchange and hostkey algorithms already anyway.
818 - sshd(8): When a forced-command appears in both a certificate and an
819 authorized keys/principals command= restriction, sshd will now refuse
820 to accept the certificate unless they are identical. The previous
821 (documented) behaviour of having the certificate forced-command
822 override the other could be a bit confusing and error-prone.
823 - sshd(8): Remove the UseLogin configuration directive and support for
824 having /bin/login manage login sessions.
825 - CVE-2016-10009: ssh-agent(1): Will now refuse to load PKCS#11 modules
826 from paths outside a trusted whitelist (run-time configurable).
827 Requests to load modules could be passed via agent forwarding and an
828 attacker could attempt to load a hostile PKCS#11 module across the
829 forwarded agent channel: PKCS#11 modules are shared libraries, so this
830 would result in code execution on the system running the ssh-agent if
831 the attacker has control of the forwarded agent-socket (on the host
832 running the sshd server) and the ability to write to the filesystem of
833 the host running ssh-agent (usually the host running the ssh client)
834 (closes: #848714).
835 - CVE-2016-10010: sshd(8): When privilege separation is disabled,
836 forwarded Unix-domain sockets would be created by sshd(8) with the
837 privileges of 'root' instead of the authenticated user. This release
838 refuses Unix-domain socket forwarding when privilege separation is
839 disabled (Privilege separation has been enabled by default for 14
840 years) (closes: #848715).
841 - CVE-2016-10011: sshd(8): Avoid theoretical leak of host private key
842 material to privilege-separated child processes via realloc() when
843 reading keys. No such leak was observed in practice for normal-sized
844 keys, nor does a leak to the child processes directly expose key
845 material to unprivileged users (closes: #848716).
846 - CVE-2016-10012: sshd(8): The shared memory manager used by
847 pre-authentication compression support had a bounds checks that could
848 be elided by some optimising compilers. Additionally, this memory
849 manager was incorrectly accessible when pre-authentication compression
850 was disabled. This could potentially allow attacks against the
851 privileged monitor process from the sandboxed privilege-separation
852 process (a compromise of the latter would be required first). This
853 release removes support for pre-authentication compression from
854 sshd(8) (closes: #848717).
855 - SECURITY: sshd(8): Validate address ranges for AllowUser and DenyUsers
856 directives at configuration load time and refuse to accept invalid
857 ones. It was previously possible to specify invalid CIDR address
858 ranges (e.g. user@127.1.2.3/55) and these would always match, possibly
859 resulting in granting access where it was not intended.
860 - ssh(1): Add a proxy multiplexing mode to ssh(1) inspired by the
861 version in PuTTY by Simon Tatham. This allows a multiplexing client
862 to communicate with the master process using a subset of the SSH
863 packet and channels protocol over a Unix-domain socket, with the main
864 process acting as a proxy that translates channel IDs, etc. This
865 allows multiplexing mode to run on systems that lack file-descriptor
866 passing (used by current multiplexing code) and potentially, in
867 conjunction with Unix-domain socket forwarding, with the client and
868 multiplexing master process on different machines. Multiplexing proxy
869 mode may be invoked using "ssh -O proxy ...".
870 - sshd(8): Add a sshd_config DisableForwarding option that disables X11,
871 agent, TCP, tunnel and Unix domain socket forwarding, as well as
872 anything else we might implement in the future. Like the 'restrict'
873 authorized_keys flag, this is intended to be a simple and future-proof
874 way of restricting an account.
875 - sshd(8), ssh(1): Support the "curve25519-sha256" key exchange method.
876 This is identical to the currently-supported method named
877 "curve25519-sha256@libssh.org".
878 - sshd(8): Improve handling of SIGHUP by checking to see if sshd is
879 already daemonised at startup and skipping the call to daemon(3) if it
880 is. This ensures that a SIGHUP restart of sshd(8) will retain the
881 same process-ID as the initial execution. sshd(8) will also now
882 unlink the PidFile prior to SIGHUP restart and re-create it after a
883 successful restart, rather than leaving a stale file in the case of a
884 configuration error.
885 - sshd(8): Allow ClientAliveInterval and ClientAliveCountMax directives
886 to appear in sshd_config Match blocks.
887 - sshd(8): Add %-escapes to AuthorizedPrincipalsCommand to match those
888 supported by AuthorizedKeysCommand (key, key type, fingerprint, etc.)
889 and a few more to provide access to the contents of the certificate
890 being offered.
891 - ssh(1): Allow IdentityFile to successfully load and use certificates
892 that have no corresponding bare public key.
893 - ssh(1): Fix public key authentication when multiple authentication is
894 in use and publickey is not just the first method attempted.
895 - ssh(1): Improve reporting when attempting to load keys from PKCS#11
896 tokens with fewer useless log messages and more detail in debug
897 messages.
898 - ssh(1): When tearing down ControlMaster connections, don't pollute
899 stderr when LogLevel=quiet.
900 - sftp(1): On ^Z wait for underlying ssh(1) to suspend before suspending
901 sftp(1) to ensure that ssh(1) restores the terminal mode correctly if
902 suspended during a password prompt.
903 - ssh(1): Avoid busy-wait when ssh(1) is suspended during a password
904 prompt (LP: #1646813).
905 - ssh(1), sshd(8): Correctly report errors during sending of ext-info
906 messages.
907 - sshd(8): Fix NULL-deref crash if sshd(8) received an out-of-sequence
908 NEWKEYS message.
909 - sshd(8): Correct list of supported signature algorithms sent in the
910 server-sig-algs extension.
911 - sshd(8): Fix sending ext_info message if privsep is disabled.
912 - sshd(8): More strictly enforce the expected ordering of privilege
913 separation monitor calls used for authentication and allow them only
914 when their respective authentication methods are enabled in the
915 configuration.
916 - sshd_config(5): Use 2001:db8::/32, the official IPv6 subnet for
917 configuration examples.
918 - On environments configured with Turkish locales, fall back to the
919 C/POSIX locale to avoid errors in configuration parsing caused by that
920 locale's unique handling of the letters 'i' and 'I' (LP: #1638338).
921 - contrib: Add a gnome-ssh-askpass3 with GTK+3 support.
922 - sshd(8): Improve PRNG reseeding across privilege separation and force
923 libcrypto to obtain a high-quality seed before chroot or sandboxing.
924 * Apply "wrap-and-sort -at -f debian/control -f debian/tests/control".
925 * Remove entries related to protocol 1 from the default sshd_config
926 generated on new installations.
927 * Remove some advice related to protocol 1 from README.Debian.
928 * Start handling /etc/ssh/sshd_config using ucf. The immediate motivation
929 for this is to deal with deprecations of options related to protocol 1,
930 but something like this has been needed for a long time (closes:
931 #419574, #848089):
932 - sshd_config is now a slightly-patched version of upstream's, and only
933 contains non-default settings (closes: #147201).
934 - I've included as many historical md5sums of default versions of
935 sshd_config as I could reconstruct from version control, but I'm sure
936 I've missed some.
937 - Explicitly synchronise the debconf database with the current
938 configuration file state in openssh-server.config, to ensure that the
939 PermitRootLogin setting is properly preserved.
940 - UsePrivilegeSeparation now defaults to the stronger "sandbox" rather
941 than "yes", per upstream.
942 * Remove redundant "GSSAPIDelegateCredentials no" from ssh_config (already
943 the upstream default), and document that setting ServerAliveInterval to
944 300 by default if BatchMode is set is Debian-specific (closes: #765630).
945 * Build gnome-ssh-askpass with GTK+ 3 (LP: #801187).
946 * When running regression tests under autopkgtest, use a non-root user
947 with passwordless sudo.
948
949 -- Colin Watson <cjwatson@debian.org> Tue, 27 Dec 2016 18:01:46 +0000
950
951openssh (1:7.3p1-5) unstable; urgency=medium
952
953 * debian/tests/control: Add dependency on openssl, required by the PuTTY
954 interoperability tests.
955
956 -- Colin Watson <cjwatson@debian.org> Sat, 03 Dec 2016 03:43:21 +0000
957
958openssh (1:7.3p1-4) unstable; urgency=medium
959
960 * Adjust Build-Depends further to avoid considering libssl-dev >= 1.1.0~
961 as sufficient.
962 * Move build directories under debian/.
963 * Remove the non-upstream .gitignore file and add the relevant entries to
964 debian/.gitignore, in order to make the source tree more
965 dgit-compatible.
966 * Build all upstream regression test binaries using the new
967 "regress-binaries" target.
968 * Fix and enable PuTTY interoperability tests under autopkgtest.
969
970 -- Colin Watson <cjwatson@debian.org> Fri, 02 Dec 2016 20:49:30 +0000
971
972openssh (1:7.3p1-3) unstable; urgency=medium
973
974 * Avoid building with OpenSSL 1.1 for now (see #828475).
975 * Add a missing License line to debian/copyright.
976 * Policy version 3.9.8: no changes required.
977
978 -- Colin Watson <cjwatson@debian.org> Sat, 05 Nov 2016 15:37:15 +0000
979
980openssh (1:7.3p1-2) unstable; urgency=high
981
982 * Rewrite debian/copyright using copyright-format 1.0.
983 * CVE-2016-8858: Unregister the KEXINIT handler after message has been
984 received (closes: #841884).
985
986 -- Colin Watson <cjwatson@debian.org> Mon, 24 Oct 2016 11:18:00 +0100
987
988openssh (1:7.3p1-1) unstable; urgency=medium
989
990 * New upstream release (http://www.openssh.com/txt/release-7.3):
991 - SECURITY: sshd(8): Mitigate a potential denial-of-service attack
992 against the system's crypt(3) function via sshd(8). An attacker could
993 send very long passwords that would cause excessive CPU use in
994 crypt(3). sshd(8) now refuses to accept password authentication
995 requests of length greater than 1024 characters.
996 - SECURITY: ssh(1), sshd(8): Fix observable timing weakness in the CBC
997 padding oracle countermeasures. Note that CBC ciphers are disabled by
998 default and only included for legacy compatibility.
999 - SECURITY: ssh(1), sshd(8): Improve operation ordering of MAC
1000 verification for Encrypt-then-MAC (EtM) mode transport MAC algorithms
1001 to verify the MAC before decrypting any ciphertext. This removes the
1002 possibility of timing differences leaking facts about the plaintext,
1003 though no such leakage has been observed.
1004 - ssh(1): Add a ProxyJump option and corresponding -J command-line flag
1005 to allow simplified indirection through a one or more SSH bastions or
1006 "jump hosts".
1007 - ssh(1): Add an IdentityAgent option to allow specifying specific agent
1008 sockets instead of accepting one from the environment.
1009 - ssh(1): Allow ExitOnForwardFailure and ClearAllForwardings to be
1010 optionally overridden when using ssh -W.
1011 - ssh(1), sshd(8): Implement support for the IUTF8 terminal mode as per
1012 draft-sgtatham-secsh-iutf8-00 (closes: #337041, LP: #394570).
1013 - ssh(1), sshd(8): Add support for additional fixed Diffie-Hellman 2K,
1014 4K and 8K groups from draft-ietf-curdle-ssh-kex-sha2-03.
1015 - ssh-keygen(1), ssh(1), sshd(8): Support SHA256 and SHA512 RSA
1016 signatures in certificates.
1017 - ssh(1): Add an Include directive for ssh_config(5) files (closes:
1018 #536031).
1019 - ssh(1): Permit UTF-8 characters in pre-authentication banners sent
1020 from the server.
1021 - ssh(1), sshd(8): Reduce the syslog level of some relatively common
1022 protocol events from LOG_CRIT.
1023 - sshd(8): Refuse AuthenticationMethods="" in configurations and accept
1024 AuthenticationMethods=any for the default behaviour of not requiring
1025 multiple authentication.
1026 - sshd(8): Remove obsolete and misleading "POSSIBLE BREAK-IN ATTEMPT!"
1027 message when forward and reverse DNS don't match.
1028 - ssh(1): Deduplicate LocalForward and RemoteForward entries to fix
1029 failures when both ExitOnForwardFailure and hostname canonicalisation
1030 are enabled.
1031 - sshd(8): Remove fallback from moduli to obsolete "primes" file that
1032 was deprecated in 2001 (LP: #1528251).
1033 - sshd_config(5): Correct description of UseDNS: it affects ssh hostname
1034 processing for authorized_keys, not known_hosts.
1035 - sshd(8): Send ClientAliveInterval pings when a time-based RekeyLimit
1036 is set; previously keepalive packets were not being sent.
1037 - sshd(8): Whitelist more architectures to enable the seccomp-bpf
1038 sandbox.
1039 - scp(1): Respect the local user's LC_CTYPE locale (closes: #396295).
1040 - Take character display widths into account for the progressmeter
1041 (closes: #407088).
1042
1043 -- Colin Watson <cjwatson@debian.org> Sun, 07 Aug 2016 22:45:26 +0100
1044
1045openssh (1:7.2p2-8) unstable; urgency=medium
1046
1047 [ Colin Watson ]
1048 * Stop enabling ssh-session-cleanup.service by default; instead, ship it
1049 as an example and add a section to README.Debian. libpam-systemd >= 230
1050 and "UsePAM yes" should take care of the original problem for most
1051 systemd users (thanks, Michael Biebl; closes: #832155).
1052
1053 [ Martin Pitt ]
1054 * Add debian/agent-launch: Helper script for conditionally starting the SSH
1055 agent in the user session. Use it in ssh-agent.user-session.upstart.
1056 * Add systemd user unit for graphical sessions that use systemd. Override
1057 the corresponding upstart job in that case (closes: #832445).
1058 * debian/openssh-server.if-up: Don't block on a finished reload of
1059 openssh.service, to avoid deadlocking with restarting networking.
1060 (closes: #832557, LP: #1584393)
1061
1062 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2016 02:51:32 +0100
1063
1064openssh (1:7.2p2-7) unstable; urgency=medium
1065
1066 * Don't stop the ssh-session-cleanup service on upgrade (closes: #832155).
1067 This may cause SSH sessions to be killed on upgrade to *this* version if
1068 you had previously installed 1:7.2p2-6. Sorry! If your session is
1069 killed, you can recover using "dpkg --unpack" on this openssh-server
1070 .deb, followed by "dpkg --configure -a".
1071 * Recommend libpam-systemd from openssh-server. It's a much better
1072 solution than the above for systemd users, but I'm wary of depending on
1073 it in case I cause an assortment of exciting dependency problems on
1074 upgrade for non-systemd users.
1075
1076 -- Colin Watson <cjwatson@debian.org> Sat, 23 Jul 2016 11:46:33 +0100
1077
1078openssh (1:7.2p2-6) unstable; urgency=medium
1079
1080 * debian/watch: Switch to HTTP (thanks, Nicholas Luedtke; closes:
1081 #822997).
1082 * Copy summary of supported SFTP protocol versions from upstream's
1083 PROTOCOL file into the openssh-sftp-server package description (closes:
1084 #766887).
1085 * Set SSH_PROGRAM=/usr/bin/ssh1 when building openssh-client-ssh1 so that
1086 scp1 works (reported by Olivier MATZ).
1087 * Retroactively add a NEWS.Debian entry for the UseDNS change in 6.9 (see
1088 LP #1588457).
1089 * CVE-2016-6210: Mitigate user enumeration via covert timing channel
1090 (closes: #831902).
1091 * Backport upstream patch to close ControlPersist background process
1092 stderr when not in debug mode or when logging to a file or syslog
1093 (closes: #714526).
1094 * Add a session cleanup script and a systemd unit file to trigger it,
1095 which serves to terminate SSH sessions cleanly if systemd doesn't do
1096 that itself, often because libpam-systemd is not installed (thanks,
1097 Vivek Das Mohapatra, Tom Hutter, and others; closes: #751636).
1098 * Stop generating DSA host keys by default (thanks, Santiago Vila; closes:
1099 #823827).
1100
1101 -- Colin Watson <cjwatson@debian.org> Fri, 22 Jul 2016 17:06:19 +0100
1102
1103openssh (1:7.2p2-5) unstable; urgency=medium
1104
1105 * Backport upstream patch to unbreak authentication using lone certificate
1106 keys in ssh-agent: when attempting pubkey auth with a certificate, if no
1107 separate private key is found among the keys then try with the
1108 certificate key itself (thanks, Paul Querna; LP: #1575961).
1109
1110 -- Colin Watson <cjwatson@debian.org> Thu, 28 Apr 2016 01:52:01 +0100
1111
1112openssh (1:7.2p2-4) unstable; urgency=medium
1113
1114 * Drop dependency on libnss-files-udeb (closes: #819686).
1115 * Policy version 3.9.7: no changes required.
1116
1117 -- Colin Watson <cjwatson@debian.org> Fri, 15 Apr 2016 16:40:07 +0100
1118
1119openssh (1:7.2p2-3) unstable; urgency=high
1120
1121 * Change all openssh.org references to openssh.com (closes: #819213).
1122 * CVE-2015-8325: Ignore PAM environment vars when UseLogin=yes.
1123
1124 -- Colin Watson <cjwatson@debian.org> Wed, 13 Apr 2016 16:42:28 +0100
1125
1126openssh (1:7.2p2-2) unstable; urgency=medium
1127
1128 * Fix kexgss_server to cope with DH_GRP_MIN/DH_GRP_MAX being stricter on
1129 the server end than the client (thanks, Damien Miller; closes: #817870,
1130 LP: #1558576).
1131
1132 -- Colin Watson <cjwatson@debian.org> Mon, 21 Mar 2016 12:08:55 +0000
1133
1134openssh (1:7.2p2-1) unstable; urgency=high
1135
1136 * New upstream release (http://www.openssh.com/txt/release-7.2p2):
1137 - CVE-2016-3115: sshd(8): Sanitise X11 authentication credentials to
1138 avoid xauth command injection when X11Forwarding is enabled
1139 (http://www.openssh.com/txt/x11fwd.adv).
1140
1141 -- Colin Watson <cjwatson@debian.org> Thu, 10 Mar 2016 13:04:29 +0000
1142
1143openssh (1:7.2p1-1) unstable; urgency=medium
1144
1145 * New upstream release (http://www.openssh.com/txt/release-7.2):
1146 - This release disables a number of legacy cryptographic algorithms by
1147 default in ssh:
1148 + Several ciphers blowfish-cbc, cast128-cbc, all arcfour variants and
1149 the rijndael-cbc aliases for AES.
1150 + MD5-based and truncated HMAC algorithms.
1151 These algorithms are already disabled by default in sshd.
1152 - ssh(1), sshd(8): Remove unfinished and unused roaming code (was
1153 already forcibly disabled in OpenSSH 7.1p2).
1154 - ssh(1): Eliminate fallback from untrusted X11 forwarding to trusted
1155 forwarding when the X server disables the SECURITY extension.
1156 - ssh(1), sshd(8): Increase the minimum modulus size supported for
1157 diffie-hellman-group-exchange to 2048 bits.
1158 - sshd(8): Pre-auth sandboxing is now enabled by default (previous
1159 releases enabled it for new installations via sshd_config).
1160 - all: Add support for RSA signatures using SHA-256/512 hash algorithms
1161 based on draft-rsa-dsa-sha2-256-03.txt and draft-ssh-ext-info-04.txt.
1162 - ssh(1): Add an AddKeysToAgent client option which can be set to 'yes',
1163 'no', 'ask', or 'confirm', and defaults to 'no'. When enabled, a
1164 private key that is used during authentication will be added to
1165 ssh-agent if it is running (with confirmation enabled if set to
1166 'confirm').
1167 - sshd(8): Add a new authorized_keys option "restrict" that includes all
1168 current and future key restrictions (no-*-forwarding, etc.). Also add
1169 permissive versions of the existing restrictions, e.g. "no-pty" ->
1170 "pty". This simplifies the task of setting up restricted keys and
1171 ensures they are maximally-restricted, regardless of any permissions
1172 we might implement in the future.
1173 - ssh(1): Add ssh_config CertificateFile option to explicitly list
1174 certificates.
1175 - ssh-keygen(1): Allow ssh-keygen to change the key comment for all
1176 supported formats (closes: #811125).
1177 - ssh-keygen(1): Allow fingerprinting from standard input, e.g.
1178 "ssh-keygen -lf -" (closes: #509058).
1179 - ssh-keygen(1): Allow fingerprinting multiple public keys in a file,
1180 e.g. "ssh-keygen -lf ~/.ssh/authorized_keys".
1181 - sshd(8): Support "none" as an argument for sshd_config Foreground and
1182 ChrootDirectory. Useful inside Match blocks to override a global
1183 default.
1184 - ssh-keygen(1): Support multiple certificates (one per line) and
1185 reading from standard input (using "-f -") for "ssh-keygen -L"
1186 - ssh-keyscan(1): Add "ssh-keyscan -c ..." flag to allow fetching
1187 certificates instead of plain keys.
1188 - ssh(1): Better handle anchored FQDNs (e.g. 'cvs.openbsd.org.') in
1189 hostname canonicalisation - treat them as already canonical and remove
1190 the trailing '.' before matching ssh_config.
1191 - sftp(1): Existing destination directories should not terminate
1192 recursive uploads (regression in OpenSSH 6.8; LP: #1553378).
1193 * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
1194 * Restore slogin symlinks for compatibility, although they were removed
1195 upstream.
1196
1197 -- Colin Watson <cjwatson@debian.org> Tue, 08 Mar 2016 11:47:20 +0000
1198
1199openssh (1:7.1p2-2) unstable; urgency=medium
1200
1201 * Remove protocol 1 host key generation from openssh-server.postinst
1202 (closes: #811265).
1203
1204 -- Colin Watson <cjwatson@debian.org> Sun, 17 Jan 2016 14:10:19 +0000
1205
1206openssh (1:7.1p2-1) unstable; urgency=high
1207
1208 * New upstream release (http://www.openssh.com/txt/release-7.1p2):
1209 - CVE-2016-0777, CVE-2016-0778: Disable experimental client-side support
1210 for roaming, which could be tricked by a malicious server into leaking
1211 client memory to the server, including private client user keys; this
1212 information leak is restricted to connections to malicious or
1213 compromised servers (closes: #810984).
1214 - SECURITY: Fix an out of-bound read access in the packet handling code.
1215 Reported by Ben Hawkes.
1216 - Further use of explicit_bzero has been added in various buffer
1217 handling code paths to guard against compilers aggressively doing
1218 dead-store removal.
1219
1220 -- Colin Watson <cjwatson@debian.org> Thu, 14 Jan 2016 15:28:03 +0000
1221
1222openssh (1:7.1p1-6) unstable; urgency=medium
1223
1224 [ Colin Watson ]
1225 * Remove explicit "XS-Testsuite: autopkgtest" from debian/control;
1226 dpkg-source now figures that out automatically based on the existence of
1227 debian/tests/control.
1228 * Allow authenticating as root using gssapi-keyex even with
1229 "PermitRootLogin prohibit-password" (closes: #809695).
1230 * Shuffle PROPOSAL_KEX_ALGS mangling for GSSAPI key exchange a little
1231 later in ssh_kex2 so that it's actually effective (closes: #809696).
1232
1233 [ Michael Biebl ]
1234 * Don't call sd_notify when sshd is re-execed (closes: #809035).
1235
1236 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2016 15:09:10 +0000
1237
1238openssh (1:7.1p1-5) unstable; urgency=medium
1239
1240 [ Michael Biebl ]
1241 * Add systemd readiness notification support (closes: #778913).
1242
1243 -- Colin Watson <cjwatson@debian.org> Mon, 21 Dec 2015 22:10:07 +0000
1244
1245openssh (1:7.1p1-4) unstable; urgency=medium
1246
1247 * Backport upstream patch to unbreak connections with peers that set
1248 first_kex_follows (LP: #1526357).
1249
1250 -- Colin Watson <cjwatson@debian.org> Tue, 15 Dec 2015 15:40:18 +0000
1251
1252openssh (1:7.1p1-3) unstable; urgency=medium
1253
1254 * Drop priority of openssh-client-ssh1 to extra (closes: #807518).
1255 * Redirect regression test input from /dev/zero, since otherwise conch
1256 will immediately send EOF.
1257
1258 -- Colin Watson <cjwatson@debian.org> Thu, 10 Dec 2015 15:12:10 +0000
1259
1260openssh (1:7.1p1-2) unstable; urgency=medium
1261
1262 * Really enable conch interoperability tests under autopkgtest.
1263 * Drop SSH1 keepalive patch. Now that SSH1 is disabled at compile-time,
1264 it's been rejected upstream and there isn't much point carrying it any
1265 more.
1266 * Add NEWS.Debian documenting cryptographic changes in OpenSSH 7.0
1267 (closes: #806962).
1268 * Add an openssh-client-ssh1 binary package for people who need to connect
1269 to outdated SSH1-only servers (closes: #807107).
1270 * Update "Subsystem sftp" path in example sshd_config (closes: #691004,
1271 LP: #1437005).
1272
1273 -- Colin Watson <cjwatson@debian.org> Tue, 08 Dec 2015 15:33:08 +0000
1274
1275openssh (1:7.1p1-1) unstable; urgency=medium
1276
1277 * New upstream release (http://www.openssh.com/txt/release-7.0, closes:
1278 #785190):
1279 - Support for the legacy SSH version 1 protocol is disabled by default
1280 at compile time.
1281 - Support for the 1024-bit diffie-hellman-group1-sha1 key exchange is
1282 disabled by default at run-time. It may be re-enabled using the
1283 instructions at http://www.openssh.com/legacy.html
1284 - Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled by
1285 default at run-time. These may be re-enabled using the instructions
1286 at http://www.openssh.com/legacy.html
1287 - Support for the legacy v00 cert format has been removed.
1288 - The default for the sshd_config(5) PermitRootLogin option has changed
1289 from "yes" to "prohibit-password".
1290 - PermitRootLogin=without-password/prohibit-password now bans all
1291 interactive authentication methods, allowing only public-key,
1292 hostbased and GSSAPI authentication (previously it permitted
1293 keyboard-interactive and password-less authentication if those were
1294 enabled).
1295 - ssh_config(5): Add PubkeyAcceptedKeyTypes option to control which
1296 public key types are available for user authentication.
1297 - sshd_config(5): Add HostKeyAlgorithms option to control which public
1298 key types are offered for host authentications.
1299 - ssh(1), sshd(8): Extend Ciphers, MACs, KexAlgorithms,
1300 HostKeyAlgorithms, PubkeyAcceptedKeyTypes and HostbasedKeyTypes
1301 options to allow appending to the default set of algorithms instead of
1302 replacing it. Options may now be prefixed with a '+' to append to the
1303 default, e.g. "HostKeyAlgorithms=+ssh-dss".
1304 - sshd_config(5): PermitRootLogin now accepts an argument of
1305 'prohibit-password' as a less-ambiguous synonym of 'without-
1306 password'.
1307 - ssh(1), sshd(8): Add compatability workarounds for Cisco and more
1308 PuTTY versions.
1309 - Fix some omissions and errors in the PROTOCOL and PROTOCOL.mux
1310 documentation relating to Unix domain socket forwarding.
1311 - ssh(1): Improve the ssh(1) manual page to include a better description
1312 of Unix domain socket forwarding (closes: #779068).
1313 - ssh(1), ssh-agent(1): Skip uninitialised PKCS#11 slots, fixing
1314 failures to load keys when they are present.
1315 - ssh(1), ssh-agent(1): Do not ignore PKCS#11 hosted keys that wth empty
1316 CKA_ID.
1317 - sshd(8): Clarify documentation for UseDNS option.
1318 - Check realpath(3) behaviour matches what sftp-server requires and use
1319 a replacement if necessary.
1320 * New upstream release (http://www.openssh.com/txt/release-7.1):
1321 - sshd(8): OpenSSH 7.0 contained a logic error in PermitRootLogin=
1322 prohibit-password/without-password that could, depending on
1323 compile-time configuration, permit password authentication to root
1324 while preventing other forms of authentication. This problem was
1325 reported by Mantas Mikulenas.
1326 - ssh(1), sshd(8): Add compatibility workarounds for FuTTY.
1327 - ssh(1), sshd(8): Refine compatibility workarounds for WinSCP.
1328 - Fix a number of memory faults (double-free, free of uninitialised
1329 memory, etc) in ssh(1) and ssh-keygen(1). Reported by Mateusz
1330 Kocielski.
1331 * Change "PermitRootLogin without-password" to the new preferred spelling
1332 of "PermitRootLogin prohibit-password" in sshd_config, and update
1333 documentation to reflect the new upstream default.
1334 * Enable conch interoperability tests under autopkgtest.
1335
1336 -- Colin Watson <cjwatson@debian.org> Wed, 02 Dec 2015 20:18:35 +0000
1337
1338openssh (1:6.9p1-3) unstable; urgency=medium
1339
1340 * ssh_config(5): Fix markup errors in description of GSSAPITrustDns
1341 (closes: #799271).
1342 * Fix dh_install and dh_fixperms overrides to work properly with an
1343 architecture-independent-only build (closes: #806090).
1344 * Do much less work in architecture-independent-only builds.
1345 * Drop ConsoleKit session registration patch; it was only ever enabled for
1346 Ubuntu, which no longer needs it (LP: #1334916, #1502045).
1347
1348 -- Colin Watson <cjwatson@debian.org> Tue, 24 Nov 2015 22:48:53 +0000
1349
1350openssh (1:6.9p1-2) unstable; urgency=medium
1351
1352 [ Colin Watson ]
1353 * mention-ssh-keygen-on-keychange.patch: Move example ssh-keygen
1354 invocation onto a separate line to make it easier to copy and paste
1355 (LP: #1491532).
1356
1357 [ Tyler Hicks ]
1358 * Build with audit support on Linux (closes: #797727, LP: #1478087).
1359
1360 -- Colin Watson <cjwatson@debian.org> Thu, 10 Sep 2015 12:26:11 +0100
1361
1362openssh (1:6.9p1-1) unstable; urgency=medium
1363
1364 * New upstream release (http://www.openssh.com/txt/release-6.8):
1365 - sshd(8): UseDNS now defaults to 'no'. Configurations that match
1366 against the client host name (via sshd_config or authorized_keys) may
1367 need to re-enable it or convert to matching against addresses.
1368 - Add FingerprintHash option to ssh(1) and sshd(8), and equivalent
1369 command-line flags to the other tools to control algorithm used for
1370 key fingerprints. The default changes from MD5 to SHA256 and format
1371 from hex to base64.
1372 Fingerprints now have the hash algorithm prepended. An example of the
1373 new format: SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE
1374 Please note that visual host keys will also be different.
1375 - ssh(1), sshd(8): Experimental host key rotation support. Add a
1376 protocol extension for a server to inform a client of all its
1377 available host keys after authentication has completed. The client
1378 may record the keys in known_hosts, allowing it to upgrade to better
1379 host key algorithms and a server to gracefully rotate its keys.
1380 The client side of this is controlled by a UpdateHostkeys config
1381 option (default off).
1382 - ssh(1): Add a ssh_config HostbasedKeyType option to control which host
1383 public key types are tried during host-based authentication.
1384 - ssh(1), sshd(8): Fix connection-killing host key mismatch errors when
1385 sshd offers multiple ECDSA keys of different lengths.
1386 - ssh(1): When host name canonicalisation is enabled, try to parse host
1387 names as addresses before looking them up for canonicalisation. Fixes
1388 bz#2074 and avoids needless DNS lookups in some cases.
1389 - ssh(1), ssh-keysign(8): Make ed25519 keys work for host based
1390 authentication.
1391 - sshd(8): SSH protocol v.1 workaround for the Meyer, et al,
1392 Bleichenbacher Side Channel Attack. Fake up a bignum key before RSA
1393 decryption.
1394 - sshd(8): Remember which public keys have been used for authentication
1395 and refuse to accept previously-used keys. This allows
1396 AuthenticationMethods=publickey,publickey to require that users
1397 authenticate using two _different_ public keys.
1398 - sshd(8): add sshd_config HostbasedAcceptedKeyTypes and
1399 PubkeyAcceptedKeyTypes options to allow sshd to control what public
1400 key types will be accepted (closes: #481133). Currently defaults to
1401 all.
1402 - sshd(8): Don't count partial authentication success as a failure
1403 against MaxAuthTries.
1404 - ssh(1): Add RevokedHostKeys option for the client to allow text-file
1405 or KRL-based revocation of host keys.
1406 - ssh-keygen(1), sshd(8): Permit KRLs that revoke certificates by serial
1407 number or key ID without scoping to a particular CA.
1408 - ssh(1): Add a "Match canonical" criteria that allows ssh_config Match
1409 blocks to trigger only in the second config pass.
1410 - ssh(1): Add a -G option to ssh that causes it to parse its
1411 configuration and dump the result to stdout, similar to "sshd -T".
1412 - ssh(1): Allow Match criteria to be negated. E.g. "Match !host".
1413 - ssh-keyscan(1): ssh-keyscan has been made much more robust against
1414 servers that hang or violate the SSH protocol (closes: #241119).
1415 - ssh(1), ssh-keygen(1): Fix regression bz#2306: Key path names were
1416 being lost as comment fields (closes: #787776).
1417 - ssh(1): Allow ssh_config Port options set in the second config parse
1418 phase to be applied (they were being ignored; closes: #774369).
1419 - ssh(1): Tweak config re-parsing with host canonicalisation - make the
1420 second pass through the config files always run when host name
1421 canonicalisation is enabled (and not whenever the host name changes)
1422 - ssh(1): Fix passing of wildcard forward bind addresses when connection
1423 multiplexing is in use.
1424 - ssh-keygen(1): Fix broken private key conversion from non-OpenSSH
1425 formats.
1426 - ssh-keygen(1): Fix KRL generation bug when multiple CAs are in use.
1427 * New upstream release (http://www.openssh.com/txt/release-6.9):
1428 - CVE-2015-5352: ssh(1): When forwarding X11 connections with
1429 ForwardX11Trusted=no, connections made after ForwardX11Timeout expired
1430 could be permitted and no longer subject to XSECURITY restrictions
1431 because of an ineffective timeout check in ssh(1) coupled with "fail
1432 open" behaviour in the X11 server when clients attempted connections
1433 with expired credentials (closes: #790798). This problem was reported
1434 by Jann Horn.
1435 - SECURITY: ssh-agent(1): Fix weakness of agent locking (ssh-add -x) to
1436 password guessing by implementing an increasing failure delay, storing
1437 a salted hash of the password rather than the password itself and
1438 using a timing-safe comparison function for verifying unlock attempts.
1439 This problem was reported by Ryan Castellucci.
1440 - sshd(8): Support admin-specified arguments to AuthorizedKeysCommand
1441 (closes: #740494).
1442 - sshd(8): Add AuthorizedPrincipalsCommand that allows retrieving
1443 authorized principals information from a subprocess rather than a
1444 file.
1445 - ssh(1), ssh-add(1): Support PKCS#11 devices with external PIN entry
1446 devices.
1447 - ssh-keygen(1): Support "ssh-keygen -lF hostname" to search known_hosts
1448 and print key hashes rather than full keys.
1449 - ssh-agent(1): Add -D flag to leave ssh-agent in foreground without
1450 enabling debug mode.
1451 - ssh(1), sshd(8): Deprecate legacy SSH2_MSG_KEX_DH_GEX_REQUEST_OLD
1452 message and do not try to use it against some 3rd-party SSH
1453 implementations that use it (older PuTTY, WinSCP).
1454 - ssh(1), sshd(8): Cap DH-GEX group size at 4Kbits for Cisco
1455 implementations as some would fail when attempting to use group sizes
1456 >4K (closes: #740307, LP: #1287222).
1457 - ssh(1): Fix out-of-bound read in EscapeChar configuration option
1458 parsing.
1459 - sshd(8): Fix application of PermitTunnel, LoginGraceTime,
1460 AuthenticationMethods and StreamLocalBindMask options in Match blocks.
1461 - ssh(1), sshd(8): Improve disconnection message on TCP reset.
1462 - ssh(1): Remove failed remote forwards established by multiplexing from
1463 the list of active forwards.
1464 - sshd(8): Make parsing of authorized_keys "environment=" options
1465 independent of PermitUserEnv being enabled.
1466 - sshd(8): Fix post-auth crash with permitopen=none (closes: #778807).
1467 - ssh(1), ssh-add(1), ssh-keygen(1): Allow new-format private keys to be
1468 encrypted with AEAD ciphers.
1469 - ssh(1): Allow ListenAddress, Port and AddressFamily configuration
1470 options to appear in any order.
1471 - sshd(8): Check for and reject missing arguments for VersionAddendum
1472 and ForceCommand.
1473 - ssh(1), sshd(8): Don't treat unknown certificate extensions as fatal.
1474 - ssh-keygen(1): Make stdout and stderr output consistent.
1475 - ssh(1): Mention missing DISPLAY environment in debug log when X11
1476 forwarding requested.
1477 - sshd(8): Correctly record login when UseLogin is set.
1478 - sshd(8): Add some missing options to sshd -T output and fix output of
1479 VersionAddendum and HostCertificate.
1480 - Document and improve consistency of options that accept a "none"
1481 argument: TrustedUserCAKeys, RevokedKeys, AuthorizedPrincipalsFile.
1482 - ssh(1): Include remote username in debug output.
1483 - sshd(8): Avoid compatibility problem with some versions of Tera Term,
1484 which would crash when they received the hostkeys notification message
1485 (hostkeys-00@openssh.com).
1486 - sshd(8): Mention ssh-keygen -E as useful when comparing legacy MD5
1487 host key fingerprints.
1488 - ssh(1): Clarify pseudo-terminal request behaviour and make manual
1489 language consistent.
1490 - ssh(1): Document that the TERM environment variable is not subject to
1491 SendEnv and AcceptEnv; bz#2386
1492 - sshd(8): Format UsePAM setting when using sshd -T (closes: #767648).
1493 - moduli(5): Update DH-GEX moduli (closes: #787037).
1494 * There are some things I want to fix before upgrading to 7.0p1, though I
1495 intend to do that soon. In the meantime, backport some patches, mainly
1496 to fix security issues:
1497 - SECURITY: sshd(8): OpenSSH 6.8 and 6.9 incorrectly set TTYs to be
1498 world-writable. Local attackers may be able to write arbitrary
1499 messages to logged-in users, including terminal escape sequences.
1500 Reported by Nikolay Edigaryev.
1501 - SECURITY: sshd(8): Fixed a privilege separation weakness related to
1502 PAM support. Attackers who could successfully compromise the
1503 pre-authentication process for remote code execution and who had valid
1504 credentials on the host could impersonate other users. Reported by
1505 Moritz Jodeit.
1506 - SECURITY: sshd(8): Fixed a use-after-free bug related to PAM support
1507 that was reachable by attackers who could compromise the
1508 pre-authentication process for remote code execution (closes:
1509 #795711). Also reported by Moritz Jodeit.
1510 - CVE-2015-5600: sshd(8): Fix circumvention of MaxAuthTries using
1511 keyboard-interactive authentication (closes: #793616). By specifying
1512 a long, repeating keyboard-interactive "devices" string, an attacker
1513 could request the same authentication method be tried thousands of
1514 times in a single pass. The LoginGraceTime timeout in sshd(8) and any
1515 authentication failure delays implemented by the authentication
1516 mechanism itself were still applied. Found by Kingcope.
1517 - Let principals-command.sh work for noexec /var/run.
1518 * Thanks to Jakub Jelen of Red Hat for Fedora's rebased version of the
1519 GSSAPI key exchange patch.
1520 * Document the Debian-specific change to the default value of
1521 ForwardX11Trusted in ssh(1) (closes: #781469).
1522
1523 -- Colin Watson <cjwatson@debian.org> Thu, 20 Aug 2015 10:38:58 +0100
1524
1525openssh (1:6.7p1-6) unstable; urgency=medium
1526
1527 [ Martin Pitt ]
1528 * openssh-server.postinst: Quiesce "Unable to connect to Upstart" error
1529 message from initctl if upstart is installed, but not the current init
1530 system. (LP: #1440070)
1531 * openssh-server.postinst: Fix version comparisons of upgrade adjustments
1532 to not apply to fresh installs.
1533
1534 -- Colin Watson <cjwatson@debian.org> Sun, 19 Apr 2015 14:32:43 +0100
1535
1536openssh (1:6.7p1-5) unstable; urgency=medium
1537
1538 * Revert change from previous upload, which causes far more trouble than
1539 it is worth (closes: #780797):
1540 - Send/accept only specific known LC_* variables, rather than using a
1541 wildcard.
1542 * Add a NEWS.Debian entry documenting this reversion, as it is too
1543 difficult to undo the sshd_config change automatically without
1544 compounding the problem of (arguably) overwriting user configuration.
1545
1546 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:20:56 +0000
1547
1548openssh (1:6.7p1-4) unstable; urgency=medium
1549
1550 * Send/accept only specific known LC_* variables, rather than using a
1551 wildcard (closes: #765633).
1552 * Document interactions between ListenAddress/Port and ssh.socket in
1553 README.Debian (closes: #764842).
1554 * Debconf translations:
1555 - Brazilian Portuguese (thanks, José de Figueiredo; closes: #771859).
1556
1557 -- Colin Watson <cjwatson@debian.org> Wed, 18 Mar 2015 15:34:13 +0000
1558
1559openssh (1:6.7p1-3) unstable; urgency=medium
1560
1561 * Debconf translations:
1562 - Dutch (thanks, Frans Spiesschaert; closes: #765851).
1563 * Assume that dpkg-statoverride exists and drop the test for an obsolete
1564 compatibility path.
1565
1566 -- Colin Watson <cjwatson@debian.org> Mon, 03 Nov 2014 20:29:52 +0000
1567
1568openssh (1:6.7p1-2) unstable; urgency=medium
1569
1570 * debian/tests/control: Drop isolation-container, since the tests run on a
1571 high port. They're still not guaranteed to run correctly in an schroot,
1572 but may manage to work, so this lets the tests at least try to run on
1573 ci.debian.net.
1574
1575 -- Colin Watson <cjwatson@debian.org> Fri, 10 Oct 2014 10:47:19 +0100
1576
1577openssh (1:6.7p1-1) unstable; urgency=medium
1578
1579 * New upstream release (http://www.openssh.com/txt/release-6.7):
1580 - sshd(8): The default set of ciphers and MACs has been altered to
1581 remove unsafe algorithms. In particular, CBC ciphers and arcfour* are
1582 disabled by default. The full set of algorithms remains available if
1583 configured explicitly via the Ciphers and MACs sshd_config options.
1584 - ssh(1), sshd(8): Add support for Unix domain socket forwarding. A
1585 remote TCP port may be forwarded to a local Unix domain socket and
1586 vice versa or both ends may be a Unix domain socket (closes: #236718).
1587 - ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519
1588 key types.
1589 - sftp(1): Allow resumption of interrupted uploads.
1590 - ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is
1591 the same as the one sent during initial key exchange.
1592 - sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses
1593 when GatewayPorts=no; allows client to choose address family.
1594 - sshd(8): Add a sshd_config PermitUserRC option to control whether
1595 ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys
1596 option.
1597 - ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that
1598 expands to a unique identifier based on a hash of the tuple of (local
1599 host, remote user, hostname, port). Helps avoid exceeding miserly
1600 pathname limits for Unix domain sockets in multiplexing control paths.
1601 - sshd(8): Make the "Too many authentication failures" message include
1602 the user, source address, port and protocol in a format similar to the
1603 authentication success / failure messages.
1604 - Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC when it is
1605 available. It considers time spent suspended, thereby ensuring
1606 timeouts (e.g. for expiring agent keys) fire correctly (closes:
1607 #734553).
1608 - Use prctl() to prevent sftp-server from accessing
1609 /proc/self/{mem,maps}.
1610 * Restore TCP wrappers support, removed upstream in 6.7. It is true that
1611 dropping this reduces preauth attack surface in sshd. On the other
1612 hand, this support seems to be quite widely used, and abruptly dropping
1613 it (from the perspective of users who don't read openssh-unix-dev) could
1614 easily cause more serious problems in practice. It's not entirely clear
1615 what the right long-term answer for Debian is, but it at least probably
1616 doesn't involve dropping this feature shortly before a freeze.
1617 * Replace patch to disable OpenSSL version check with an updated version
1618 of Kurt Roeckx's patch from #732940 to just avoid checking the status
1619 field.
1620 * Build-depend on a new enough dpkg-dev for dpkg-buildflags, rather than
1621 simply a new enough dpkg.
1622 * Simplify debian/rules using /usr/share/dpkg/buildflags.mk.
1623 * Use Package-Type rather than XC-Package-Type, now that it is an official
1624 field.
1625 * Run a subset of the upstream regression test suite at package build
1626 time, and the rest of it under autopkgtest.
1627
1628 -- Colin Watson <cjwatson@debian.org> Thu, 09 Oct 2014 14:05:56 +0100
1629
1630openssh (1:6.6p1-8) unstable; urgency=medium
1631
1632 * Make the if-up hook use "reload" rather than "restart" if the system was
1633 booted using systemd (closes: #756547).
1634 * Show fingerprints of new keys after creating them in the postinst
1635 (closes: #762128).
1636 * Policy version 3.9.6: no changes required.
1637 * Don't link /usr/share/doc/ssh to openssh-client, as this is not safe
1638 between Architecture: all and Architecture: any binary packages (closes:
1639 #763375).
1640
1641 -- Colin Watson <cjwatson@debian.org> Fri, 03 Oct 2014 12:23:57 +0100
1642
1643openssh (1:6.6p1-7) unstable; urgency=medium
1644
1645 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
1646 directly.
1647 * Use dh-exec to simplify override_dh_install target.
1648 * Remove several unnecessary entries in debian/*.dirs.
1649 * Pass noupdate to the second call to pam_motd, not the first (thanks, Ken
1650 T Takusagawa; closes: #757059).
1651 * Debconf translations:
1652 - Turkish (thanks, Mert Dirik; closes: #756757).
1653
1654 -- Colin Watson <cjwatson@debian.org> Tue, 05 Aug 2014 09:10:04 +0100
1655
1656openssh (1:6.6p1-6) unstable; urgency=medium
1657
1658 * Upgrade to debhelper v9.
1659 * Only use pam_keyinit on Linux architectures (closes: #747245).
1660 * Make get_config_option more robust against trailing whitespace (thanks,
1661 LaMont Jones).
1662 * Debconf translations:
1663 - Czech (thanks, Michal Šimůnek; closes: #751419).
1664
1665 -- Colin Watson <cjwatson@debian.org> Sat, 28 Jun 2014 14:50:04 +0100
1666
1667openssh (1:6.6p1-5) unstable; urgency=medium
1668
1669 * Force ssh-agent Upstart job to use sh syntax regardless of the user's
1670 shell (thanks, Steffen Stempel; LP: #1312928).
1671
1672 -- Colin Watson <cjwatson@debian.org> Thu, 01 May 2014 16:27:53 +0100
1673
1674openssh (1:6.6p1-4) unstable; urgency=medium
1675
1676 * Debconf translations:
1677 - Spanish (thanks, Matías Bellone; closes: #744867).
1678 * Apply upstream-recommended patch to fix bignum encoding for
1679 curve25519-sha256@libssh.org, fixing occasional key exchange failures.
1680
1681 -- Colin Watson <cjwatson@debian.org> Mon, 21 Apr 2014 21:29:53 +0100
1682
1683openssh (1:6.6p1-3) unstable; urgency=medium
1684
1685 * Debconf translations:
1686 - French (thanks, Étienne Gilli; closes: #743242).
1687 * Never signal the service supervisor with SIGSTOP more than once, to
1688 prevent a hang on re-exec (thanks, Robie Basak; LP: #1306877).
1689
1690 -- Colin Watson <cjwatson@debian.org> Mon, 14 Apr 2014 12:11:50 +0100
1691
1692openssh (1:6.6p1-2) unstable; urgency=medium
1693
1694 * If no root password is set, then switch to "PermitRootLogin
1695 without-password" without asking (LP: #1300127).
1696
1697 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2014 12:20:46 +0100
1698
1699openssh (1:6.6p1-1) unstable; urgency=medium
1700
1701 [ Colin Watson ]
1702 * Apply various warning-suppression and regression-test fixes to
1703 gssapi.patch from Damien Miller.
1704 * New upstream release (http://www.openssh.com/txt/release-6.6,
1705 LP: #1298280):
1706 - CVE-2014-2532: sshd(8): when using environment passing with an
1707 sshd_config(5) AcceptEnv pattern with a wildcard, OpenSSH prior to 6.6
1708 could be tricked into accepting any environment variable that contains
1709 the characters before the wildcard character.
1710 * Re-enable btmp logging, as its permissions were fixed a long time ago in
1711 response to #370050 (closes: #341883).
1712 * Change to "PermitRootLogin without-password" for new installations, and
1713 ask a debconf question when upgrading systems with "PermitRootLogin yes"
1714 from previous versions (closes: #298138).
1715 * Debconf translations:
1716 - Danish (thanks, Joe Hansen).
1717 - Portuguese (thanks, Américo Monteiro).
1718 - Russian (thanks, Yuri Kozlov; closes: #742308).
1719 - Swedish (thanks, Andreas Rönnquist).
1720 - Japanese (thanks, victory).
1721 - German (thanks, Stephan Beck; closes: #742541).
1722 - Italian (thanks, Beatrice Torracca).
1723 * Don't start ssh-agent from the Upstart user session job if something
1724 like Xsession has already done so (based on work by Bruno Vasselle;
1725 LP: #1244736).
1726
1727 [ Matthew Vernon ]
1728 * CVE-2014-2653: Fix failure to check SSHFP records if server presents a
1729 certificate (bug reported by me, patch by upstream's Damien Miller;
1730 thanks also to Mark Wooding for his help in fixing this) (Closes:
1731 #742513)
1732
1733 -- Colin Watson <cjwatson@debian.org> Fri, 28 Mar 2014 18:04:41 +0000
1734
1735openssh (1:6.5p1-6) unstable; urgency=medium
1736
1737 * Fix Breaks/Replaces versions of openssh-sftp-server on openssh-server
1738 (thanks, Axel Beckert).
1739
1740 -- Colin Watson <cjwatson@debian.org> Thu, 06 Mar 2014 16:18:44 +0000
1741
1742openssh (1:6.5p1-5) unstable; urgency=medium
1743
1744 [ Colin Watson ]
1745 * Add Alias=sshd.service to systemd ssh.service file, to match "Provides:
1746 sshd" in the sysvinit script (thanks, Michael Biebl).
1747 * Add Before=ssh.service to systemd ssh.socket file, since otherwise
1748 nothing guarantees that ssh.service has stopped before ssh.socket starts
1749 (thanks, Uoti Urpala).
1750
1751 [ Axel Beckert ]
1752 * Split sftp-server into its own package to allow it to also be used by
1753 other SSH server implementations like dropbear (closes: #504290).
1754
1755 -- Colin Watson <cjwatson@debian.org> Wed, 05 Mar 2014 13:53:08 +0000
1756
1757openssh (1:6.5p1-4) unstable; urgency=medium
1758
1759 * Configure --without-hardening on hppa, to work around
1760 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 (closes: #738798).
1761 * Amend "Running sshd from inittab" instructions in README.Debian to
1762 recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d
1763 symlinks that won't work with dependency-based sysv-rc.
1764 * Remove code related to non-dependency-based sysv-rc ordering, since that
1765 is no longer supported.
1766 * Apply patch from https://bugzilla.mindrot.org/show_bug.cgi?id=2200 to
1767 fix getsockname errors when using "ssh -W" (closes: #738693).
1768
1769 -- Colin Watson <cjwatson@debian.org> Sat, 15 Feb 2014 02:19:36 +0000
1770
1771openssh (1:6.5p1-3) unstable; urgency=medium
1772
1773 * Clarify socket activation mode in README.Debian, as suggested by Uoti
1774 Urpala.
1775 * Stop claiming that "Protocol 2" is a Debian-specific default; this has
1776 been upstream's default since 5.4p1.
1777 * Avoid stdout noise from which(1) on purge of openssh-client.
1778 * Fix sysvinit->systemd transition code to cope with still-running
1779 sysvinit jobs being considered active by systemd (thanks, Uoti Urpala
1780 and Michael Biebl).
1781 * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may
1782 have got it wrong before, and it's fairly harmless to repeat it.
1783 * Remove tests for whether /dev/null is a character device from the
1784 Upstart job and the systemd service files; it's there to avoid a
1785 confusing failure mode in daemon(), but with modern init systems we use
1786 the -D option to suppress daemonisation anyway.
1787 * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the
1788 Debian patch) rather than plain GPL.
1789 * Drop some very old Conflicts and Replaces (ssh (<< 1:3.8.1p1-9),
1790 rsh-client (<< 0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-nonfree (<< 2),
1791 and openssh-client (<< 1:3.8.1p1-11)). These all relate to pre-etch
1792 versions, for which we no longer have maintainer script code, and per
1793 policy they would have to become Breaks nowadays anyway.
1794 * Policy version 3.9.5.
1795 * Drop unnecessary -1 in zlib1g Build-Depends version.
1796 * Tweak dh_systemd_enable invocations to avoid lots of error noise.
1797
1798 -- Colin Watson <cjwatson@debian.org> Wed, 12 Feb 2014 13:10:08 +0000
1799
1800openssh (1:6.5p1-2) unstable; urgency=medium
1801
1802 * Only enable ssh.service for systemd, not both ssh.service and
1803 ssh.socket. Thanks to Michael Biebl for spotting this.
1804 * Backport upstream patch to unbreak case-sensitive matching of ssh_config
1805 (closes: #738619).
1806
1807 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 11:28:35 +0000
1808
1809openssh (1:6.5p1-1) unstable; urgency=medium
1810
1811 * New upstream release (http://www.openssh.com/txt/release-6.5,
1812 LP: #1275068):
1813 - ssh(1): Add support for client-side hostname canonicalisation using a
1814 set of DNS suffixes and rules in ssh_config(5). This allows
1815 unqualified names to be canonicalised to fully-qualified domain names
1816 to eliminate ambiguity when looking up keys in known_hosts or checking
1817 host certificate names (closes: #115286).
1818 * Switch to git; adjust Vcs-* fields.
1819 * Convert to git-dpm, and drop source package documentation associated
1820 with the old bzr/quilt patch handling workflow.
1821 * Drop ssh-vulnkey and the associated ssh/ssh-add/sshd integration code,
1822 leaving only basic configuration file compatibility, since it has been
1823 nearly six years since the original vulnerability and this code is not
1824 likely to be of much value any more (closes: #481853, #570651). See
1825 https://lists.debian.org/debian-devel/2013/09/msg00240.html for my full
1826 reasoning.
1827 * Add OpenPGP signature checking configuration to watch file (thanks,
1828 Daniel Kahn Gillmor; closes: #732441).
1829 * Add the pam_keyinit session module, to create a new session keyring on
1830 login (closes: #734816).
1831 * Incorporate default path changes from shadow 1:4.0.18.1-8, removing
1832 /usr/bin/X11 (closes: #644521).
1833 * Generate ED25519 host keys on fresh installations. Upgraders who wish
1834 to add such host keys should manually add 'HostKey
1835 /etc/ssh/ssh_host_ed25519_key' to /etc/ssh/sshd_config and run
1836 'ssh-keygen -q -f /etc/ssh/ssh_host_ed25519_key -N "" -t ed25519'.
1837 * Drop long-obsolete "SSH now uses protocol 2 by default" section from
1838 README.Debian.
1839 * Add systemd support (thanks, Sven Joachim; closes: #676830).
1840
1841 -- Colin Watson <cjwatson@debian.org> Mon, 10 Feb 2014 14:58:26 +0000
1842
1843openssh (1:6.4p1-2) unstable; urgency=high
1844
1845 * Increase ServerKeyBits value in package-generated sshd_config to 1024
1846 (closes: #727622, LP: #1244272).
1847 * Restore patch to disable OpenSSL version check (closes: #732940).
1848
1849 -- Colin Watson <cjwatson@debian.org> Mon, 23 Dec 2013 10:44:04 +0000
1850
1851openssh (1:6.4p1-1) unstable; urgency=high
1852
1853 * New upstream release. Important changes:
1854 - 6.3/6.3p1 (http://www.openssh.com/txt/release-6.3):
1855 + sftp(1): add support for resuming partial downloads using the
1856 "reget" command and on the sftp commandline or on the "get"
1857 commandline using the "-a" (append) option (closes: #158590).
1858 + ssh(1): add an "IgnoreUnknown" configuration option to selectively
1859 suppress errors arising from unknown configuration directives
1860 (closes: #436052).
1861 + sftp(1): update progressmeter when data is acknowledged, not when
1862 it's sent (partially addresses #708372).
1863 + ssh(1): do not fatally exit when attempting to cleanup multiplexing-
1864 created channels that are incompletely opened (closes: #651357).
1865 - 6.4/6.4p1 (http://www.openssh.com/txt/release-6.4):
1866 + CVE-2013-4548: sshd(8): fix a memory corruption problem triggered
1867 during rekeying when an AES-GCM cipher is selected (closes:
1868 #729029). Full details of the vulnerability are available at:
1869 http://www.openssh.com/txt/gcmrekey.adv
1870 * When running under Upstart, only consider the daemon started once it is
1871 ready to accept connections (by raising SIGSTOP at that point and using
1872 "expect stop").
1873
1874 -- Colin Watson <cjwatson@debian.org> Sat, 09 Nov 2013 18:24:16 +0000
1875
1876openssh (1:6.2p2-6) unstable; urgency=low
1877
1878 * Update config.guess and config.sub automatically at build time.
1879 dh_autoreconf does not take care of that by default because openssh does
1880 not use automake.
1881
1882 -- Colin Watson <cjwatson@debian.org> Tue, 02 Jul 2013 22:54:49 +0100
1883
1884openssh (1:6.2p2-5) unstable; urgency=low
1885
1886 [ Colin Watson ]
1887 * Document consequences of ssh-agent being setgid in ssh-agent(1); see
1888 #711623.
1889 * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and
1890 ssh-argv0.
1891
1892 [ Yolanda Robla ]
1893 * debian/rules: Include real distribution in SSH_EXTRAVERSION instead of
1894 hardcoding Debian (LP: #1195342).
1895
1896 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jun 2013 15:24:14 +0100
1897
1898openssh (1:6.2p2-4) unstable; urgency=low
1899
1900 * Fix non-portable shell in ssh-copy-id (closes: #711162).
1901 * Rebuild against debhelper 9.20130604 with fixed dependencies for
1902 invoke-rc.d and Upstart jobs (closes: #711159, #711364).
1903 * Set SELinux context on private host keys as well as public host keys
1904 (closes: #687436).
1905
1906 -- Colin Watson <cjwatson@debian.org> Thu, 06 Jun 2013 17:06:31 +0100
1907
1908openssh (1:6.2p2-3) unstable; urgency=low
1909
1910 * If the running init daemon is Upstart, then, on the first upgrade to
1911 this version, check whether sysvinit is still managing sshd; if so,
1912 manually stop it so that it can be restarted under upstart. We do this
1913 near the end of the postinst, so it shouldn't result in any appreciable
1914 extra window where sshd is not running during upgrade.
1915
1916 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 17:42:10 +0100
1917
1918openssh (1:6.2p2-2) unstable; urgency=low
1919
1920 * Change start condition of Upstart job to be just the standard "runlevel
1921 [2345]", rather than "filesystem or runlevel [2345]"; the latter makes
1922 it unreasonably difficult to ensure that urandom starts before ssh, and
1923 is not really necessary since one of static-network-up and failsafe-boot
1924 is guaranteed to happen and will trigger entry to the default runlevel,
1925 and we don't care about ssh starting before the network (LP: #1098299).
1926 * Drop conffile handling for direct upgrades from pre-split ssh package;
1927 this was originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a
1928 truly ghastly hack around a misbehaviour in sarge's dpkg. Since this is
1929 now four Debian releases ago, we can afford to drop this and simplify
1930 the packaging.
1931 * Remove ssh/use_old_init_script, which was a workaround for a very old
1932 bug in /etc/init.d/ssh. If anyone has ignored this for >10 years then
1933 they aren't going to be convinced now (closes: #214182).
1934 * Remove support for upgrading directly from ssh-nonfree.
1935 * Remove lots of maintainer script support for direct upgrades from
1936 pre-etch (three releases before current stable).
1937 * Add #DEBHELPER# tokens to openssh-client.postinst and
1938 openssh-server.postinst.
1939 * Replace old manual conffile handling code with dpkg-maintscript-helper,
1940 via dh_installdeb.
1941 * Switch to new unified layout for Upstart jobs as documented in
1942 https://wiki.ubuntu.com/UpstartCompatibleInitScripts: the init script
1943 checks for a running Upstart, and we now let dh_installinit handle most
1944 of the heavy lifting in maintainer scripts. Ubuntu users should be
1945 essentially unaffected except that sshd may no longer start
1946 automatically in chroots if the running Upstart predates 0.9.0; but the
1947 main goal is simply not to break when openssh-server is installed in a
1948 chroot.
1949 * Remove the check for vulnerable host keys; this was first added five
1950 years ago, and everyone should have upgraded through a version that
1951 applied these checks by now. The ssh-vulnkey tool and the blacklisting
1952 support in sshd are still here, at least for the moment.
1953 * This removes the last of our uses of debconf (closes: #221531).
1954 * Use the pam_loginuid session module (thanks, Laurent Bigonville; closes:
1955 #677440, LP: #1067779).
1956 * Bracket our session stack with calls to pam_selinux close/open (thanks,
1957 Laurent Bigonville; closes: #679458).
1958 * Fix dh_builddeb invocation so that we really use xz compression for
1959 binary packages, as intended since 1:6.1p1-2.
1960
1961 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 09:07:42 +0100
1962
1963openssh (1:6.2p2-1) unstable; urgency=low
1964
1965 * New upstream release (http://www.openssh.com/txt/release-6.2p2):
1966 - Only warn for missing identity files that were explicitly specified
1967 (closes: #708275).
1968 - Fix bug in contributed contrib/ssh-copy-id script that could result in
1969 "rm *" being called on mktemp failure (closes: #708419).
1970
1971 -- Colin Watson <cjwatson@debian.org> Thu, 16 May 2013 14:05:06 +0100
1972
1973openssh (1:6.2p1-3) unstable; urgency=low
1974
1975 * Renumber Debian-specific additions to enum monitor_reqtype so that they
1976 fit within a single byte (thanks, Jason Conti; LP: #1179202).
1977
1978 -- Colin Watson <cjwatson@debian.org> Mon, 13 May 2013 10:56:04 +0100
1979
1980openssh (1:6.2p1-2) unstable; urgency=low
1981
1982 * Fix build failure on Ubuntu:
1983 - Include openbsd-compat/sys-queue.h from consolekit.c.
1984 - Fix consolekit mismerges in monitor.c and monitor_wrap.c.
1985
1986 -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 09:45:57 +0100
1987
1988openssh (1:6.2p1-1) unstable; urgency=low
1989
1990 * New upstream release (http://www.openssh.com/txt/release-6.2).
1991 - Add support for multiple required authentication in SSH protocol 2 via
1992 an AuthenticationMethods option (closes: #195716).
1993 - Fix Sophie Germain formula in moduli(5) (closes: #698612).
1994 - Update ssh-copy-id to Phil Hands' greatly revised version (closes:
1995 #99785, #322228, #620428; LP: #518883, #835901, #1074798).
1996 * Use dh-autoreconf.
1997
1998 -- Colin Watson <cjwatson@debian.org> Tue, 07 May 2013 11:48:16 +0100
1999
2000openssh (1:6.1p1-4) experimental; urgency=low
2001
2002 [ Gunnar Hjalmarsson ]
2003 * debian/openssh-server.sshd.pam: Explicitly state that ~/.pam_environment
2004 should be read, and move the pam_env calls from "auth" to "session" so
2005 that it's also read when $HOME is encrypted (LP: #952185).
2006
2007 [ Stéphane Graber ]
2008 * Add ssh-agent upstart user job. This implements something similar to
2009 the 90x11-common_ssh-agent Xsession script. That is, start ssh-agent
2010 and set the appropriate environment variables (closes: #703906).
2011
2012 -- Colin Watson <cjwatson@debian.org> Mon, 25 Mar 2013 16:58:04 +0000
2013
2014openssh (1:6.1p1-3) experimental; urgency=low
2015
2016 * Give ssh and ssh-krb5 versioned dependencies on openssh-client and
2017 openssh-server, to try to reduce confusion when people run 'apt-get
2018 install ssh' or similar and expect that to upgrade everything relevant.
2019 * CVE-2010-5107: Improve DoS resistance by changing default of MaxStartups
2020 to 10:30:100 (closes: #700102).
2021
2022 -- Colin Watson <cjwatson@debian.org> Fri, 08 Feb 2013 21:07:31 +0000
2023
2024openssh (1:6.1p1-2) experimental; urgency=low
2025
2026 * Use xz compression for binary packages.
2027 * Merge from Ubuntu:
2028 - Add support for registering ConsoleKit sessions on login. (This is
2029 currently enabled only when building for Ubuntu.)
2030 - Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's
2031 been long enough since the relevant vulnerability that we shouldn't
2032 need these installed by default nowadays.
2033 - Add an Upstart job (not currently used by default in Debian).
2034 - Add mention of ssh-keygen in ssh connect warning (Scott Moser).
2035 - Install apport hooks.
2036 * Only build with -j if DEB_BUILD_OPTIONS=parallel=* is used (closes:
2037 #694282).
2038
2039 -- Colin Watson <cjwatson@debian.org> Mon, 26 Nov 2012 16:39:07 +0000
2040
2041openssh (1:6.1p1-1) experimental; urgency=low
2042
2043 * New upstream release (http://www.openssh.com/txt/release-6.1).
2044 - Enable pre-auth sandboxing by default for new installs.
2045 - Allow "PermitOpen none" to refuse all port-forwarding requests
2046 (closes: #543683).
2047
2048 -- Colin Watson <cjwatson@debian.org> Fri, 07 Sep 2012 00:22:44 +0100
2049
2050openssh (1:6.0p1-3) unstable; urgency=low
2051
2052 * debconf template translations:
2053 - Add Indonesian (thanks, Andika Triwidada; closes: #681670).
2054 * Call restorecon on copied ~/.ssh/authorized_keys if possible, since some
2055 SELinux policies require this (closes: #658675).
2056 * Add ncurses-term to openssh-server's Recommends, since it's often needed
2057 to support unusual terminal emulators on clients (closes: #675362).
2058
2059 -- Colin Watson <cjwatson@debian.org> Fri, 24 Aug 2012 06:55:36 +0100
2060
2061openssh (1:6.0p1-2) unstable; urgency=low
2062
2063 * Tighten libssl1.0.0 and libcrypto1.0.0-udeb dependencies to the current
2064 "fix" version at build time (closes: #678661).
2065
2066 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jun 2012 12:16:06 +0100
2067
2068openssh (1:6.0p1-1) unstable; urgency=low
2069
2070 [ Roger Leigh ]
2071 * Display dynamic part of MOTD from /run/motd.dynamic, if it exists
2072 (closes: #669699).
2073
2074 [ Colin Watson ]
2075 * Update OpenSSH FAQ to revision 1.113, fixing missing line break (closes:
2076 #669667).
2077 * New upstream release (closes: #671010,
2078 http://www.openssh.com/txt/release-6.0).
2079 - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
2080 (closes: #643312, #650512, #671075).
2081 - Add a new privilege separation sandbox implementation for Linux's new
2082 seccomp sandbox, automatically enabled on platforms that support it.
2083 (Note: privilege separation sandboxing is still experimental.)
2084 * Fix a bashism in configure's seccomp_filter check.
2085 * Add a sandbox fallback mechanism, so that behaviour on Linux depends on
2086 whether the running system's kernel has seccomp_filter support, not the
2087 build system's kernel (forwarded upstream as
2088 https://bugzilla.mindrot.org/show_bug.cgi?id=2011).
2089
2090 -- Colin Watson <cjwatson@debian.org> Sat, 26 May 2012 13:48:14 +0100
2091
2092openssh (1:5.9p1-5) unstable; urgency=low
2093
2094 * Use dpkg-buildflags, including for hardening support; drop use of
2095 hardening-includes.
2096 * Fix cross-building:
2097 - Allow using a cross-architecture pkg-config.
2098 - Pass default LDFLAGS to contrib/Makefile.
2099 - Allow dh_strip to strip gnome-ssh-askpass, rather than calling
2100 'install -s'.
2101
2102 -- Colin Watson <cjwatson@debian.org> Mon, 02 Apr 2012 11:20:33 +0100
2103
2104openssh (1:5.9p1-4) unstable; urgency=low
2105
2106 * Disable OpenSSL version check again, as its SONAME is sufficient
2107 nowadays (closes: #664383).
2108
2109 -- Colin Watson <cjwatson@debian.org> Mon, 19 Mar 2012 11:06:30 +0000
2110
2111openssh (1:5.9p1-3) unstable; urgency=low
2112
2113 * debconf template translations:
2114 - Update Polish (thanks, Michał Kułach; closes: #659829).
2115 * Ignore errors writing to console in init script (closes: #546743).
2116 * Move ssh-krb5 to Section: oldlibs.
2117
2118 -- Colin Watson <cjwatson@debian.org> Fri, 24 Feb 2012 08:56:18 +0000
2119
2120openssh (1:5.9p1-2) unstable; urgency=low
2121
2122 * Mark openssh-client and openssh-server as Multi-Arch: foreign.
2123
2124 -- Colin Watson <cjwatson@debian.org> Wed, 09 Nov 2011 02:06:48 +0000
2125
2126openssh (1:5.9p1-1) unstable; urgency=low
2127
2128 * New upstream release (http://www.openssh.com/txt/release-5.9).
2129 - Introduce sandboxing of the pre-auth privsep child using an optional
2130 sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
2131 mandatory restrictions on the syscalls the privsep child can perform.
2132 - Add new SHA256-based HMAC transport integrity modes from
2133 http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt.
2134 - The pre-authentication sshd(8) privilege separation slave process now
2135 logs via a socket shared with the master process, avoiding the need to
2136 maintain /dev/log inside the chroot (closes: #75043, #429243,
2137 #599240).
2138 - ssh(1) now warns when a server refuses X11 forwarding (closes:
2139 #504757).
2140 - sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths,
2141 separated by whitespace (closes: #76312). The authorized_keys2
2142 fallback is deprecated but documented (closes: #560156).
2143 - ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4
2144 ToS/DSCP (closes: #498297).
2145 - ssh-add(1) now accepts keys piped from standard input. E.g. "ssh-add
2146 - < /path/to/key" (closes: #229124).
2147 - Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691).
2148 - Say "required" rather than "recommended" in unprotected-private-key
2149 warning (LP: #663455).
2150 * Update OpenSSH FAQ to revision 1.112.
2151
2152 -- Colin Watson <cjwatson@debian.org> Wed, 07 Sep 2011 23:46:00 +0100
2153
2154openssh (1:5.8p1-7) unstable; urgency=low
2155
2156 * Only recommend ssh-import-id when built on Ubuntu (closes: #635887).
2157 * Use 'dpkg-vendor --derives-from Ubuntu' to detect Ubuntu systems rather
2158 than 'lsb_release -is' so that Ubuntu derivatives behave the same way as
2159 Ubuntu itself.
2160
2161 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 14:27:52 +0100
2162
2163openssh (1:5.8p1-6) unstable; urgency=low
2164
2165 * openssh-client and openssh-server Suggests: monkeysphere.
2166 * Quieten logs when multiple from= restrictions are used in different
2167 authorized_keys lines for the same key; it's still not ideal, but at
2168 least you'll only get one log entry per key (closes: #630606).
2169 * Merge from Ubuntu (Dustin Kirkland):
2170 - openssh-server Recommends: ssh-import-id (no-op in Debian since that
2171 package doesn't exist there, but this reduces the Ubuntu delta).
2172
2173 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2011 17:10:18 +0100
2174
2175openssh (1:5.8p1-5) unstable; urgency=low
2176
2177 * Drop openssh-server's dependency on openssh-blacklist to a
2178 recommendation (closes: #622604).
2179 * Update Vcs-* fields and README.source for Alioth changes.
2180 * Backport from upstream:
2181 - Make hostbased auth with ECDSA keys work correctly (closes: #633368).
2182
2183 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jul 2011 11:06:47 +0100
2184
2185openssh (1:5.8p1-4) unstable; urgency=low
2186
2187 * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb,
2188 since the required minimum versions are rather old now anyway and
2189 openssl has bumped its SONAME (thanks, Julien Cristau; closes: #620828).
2190 * Remove unreachable code from openssh-server.postinst.
2191
2192 -- Colin Watson <cjwatson@debian.org> Mon, 04 Apr 2011 15:56:18 +0100
2193
2194openssh (1:5.8p1-3) unstable; urgency=low
2195
2196 * Correct ssh-keygen instruction in the changelog for 1:5.7p1-1 (thanks,
2197 Joel Stanley).
2198 * Allow ssh-add to read from FIFOs (thanks, Daniel Kahn Gillmor; closes:
2199 #614897).
2200
2201 -- Colin Watson <cjwatson@debian.org> Fri, 18 Mar 2011 16:42:42 +0000
2202
2203openssh (1:5.8p1-2) unstable; urgency=low
2204
2205 * Upload to unstable.
2206
2207 -- Colin Watson <cjwatson@debian.org> Tue, 08 Feb 2011 10:59:17 +0000
2208
2209openssh (1:5.8p1-1) experimental; urgency=low
2210
2211 * New upstream release (http://www.openssh.com/txt/release-5.8):
2212 - Fix stack information leak in legacy certificate signing
2213 (http://www.openssh.com/txt/legacy-cert.adv).
2214
2215 -- Colin Watson <cjwatson@debian.org> Sat, 05 Feb 2011 11:13:11 +0000
2216
2217openssh (1:5.7p1-2) experimental; urgency=low
2218
2219 * Fix crash in ssh_selinux_setfscreatecon when SELinux is disabled
2220 (LP: #708571).
2221
2222 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jan 2011 12:14:17 +0000
2223
2224openssh (1:5.7p1-1) experimental; urgency=low
2225
2226 * New upstream release (http://www.openssh.com/txt/release-5.7):
2227 - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
2228 and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA
2229 offer better performance than plain DH and DSA at the same equivalent
2230 symmetric key length, as well as much shorter keys.
2231 - sftp(1)/sftp-server(8): add a protocol extension to support a hard
2232 link operation. It is available through the "ln" command in the
2233 client. The old "ln" behaviour of creating a symlink is available
2234 using its "-s" option or through the preexisting "symlink" command.
2235 - scp(1): Add a new -3 option to scp: Copies between two remote hosts
2236 are transferred through the local host (closes: #508613).
2237 - ssh(1): "atomically" create the listening mux socket by binding it on
2238 a temporary name and then linking it into position after listen() has
2239 succeeded. This allows the mux clients to determine that the server
2240 socket is either ready or stale without races (closes: #454784).
2241 Stale server sockets are now automatically removed (closes: #523250).
2242 - ssh(1): install a SIGCHLD handler to reap expired child process
2243 (closes: #594687).
2244 - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
2245 temporary directories (closes: #357469, although only if you arrange
2246 for ssh-agent to actually see $TMPDIR since the setgid bit will cause
2247 it to be stripped off).
2248 * Update to current GSSAPI patch from
2249 http://www.sxw.org.uk/computing/patches/openssh-5.7p1-gsskex-all-20110125.patch:
2250 - Add GSSAPIServerIdentity option.
2251 * Generate ECDSA host keys on fresh installations. Upgraders who wish to
2252 add such host keys should manually add 'HostKey
2253 /etc/ssh/ssh_host_ecdsa_key' to /etc/ssh/sshd_config and run 'ssh-keygen
2254 -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa'.
2255 * Build-depend on libssl-dev (>= 0.9.8g) to ensure sufficient ECC support.
2256 * Backport SELinux build fix from CVS.
2257 * Rearrange selinux-role.patch so that it links properly given this
2258 SELinux build fix.
2259
2260 -- Colin Watson <cjwatson@debian.org> Wed, 26 Jan 2011 23:48:02 +0000
2261
2262openssh (1:5.6p1-3) experimental; urgency=low
2263
2264 * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no
2265 longer issues.
2266 * Merge 1:5.5p1-6.
2267
2268 -- Colin Watson <cjwatson@debian.org> Thu, 30 Dec 2010 11:48:00 +0000
2269
2270openssh (1:5.6p1-2) experimental; urgency=low
2271
2272 * Backport upstream patch to install a SIGCHLD handler to reap expired ssh
2273 child processes, preventing lots of zombies when using ControlPersist
2274 (closes: #594687).
2275
2276 -- Colin Watson <cjwatson@debian.org> Tue, 26 Oct 2010 14:46:40 +0100
2277
2278openssh (1:5.6p1-1) experimental; urgency=low
2279
2280 * New upstream release (http://www.openssh.com/txt/release-5.6):
2281 - Added a ControlPersist option to ssh_config(5) that automatically
2282 starts a background ssh(1) multiplex master when connecting. This
2283 connection can stay alive indefinitely, or can be set to automatically
2284 close after a user-specified duration of inactivity (closes: #335697,
2285 #350898, #454787, #500573, #550262).
2286 - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
2287 HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
2288 Match blocks (closes: #549858).
2289 - sftp(1): fix ls in working directories that contain globbing
2290 characters in their pathnames (LP: #530714).
2291
2292 -- Colin Watson <cjwatson@debian.org> Tue, 24 Aug 2010 00:37:54 +0100
2293
2294openssh (1:5.5p1-6) unstable; urgency=low
2295
2296 * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
2297 which is intentionally no longer shipped in the openssh-server package
2298 due to /var/run often being a temporary directory, is not removed on
2299 upgrade (closes: #575582).
2300
2301 -- Colin Watson <cjwatson@debian.org> Sun, 26 Dec 2010 18:09:29 +0000
2302
2303openssh (1:5.5p1-5) unstable; urgency=low
2304
2305 * Use an architecture wildcard for libselinux1-dev (closes: #591740).
2306 * debconf template translations:
2307 - Update Danish (thanks, Joe Hansen; closes: #592800).
2308
2309 -- Colin Watson <cjwatson@debian.org> Mon, 23 Aug 2010 22:59:03 +0100
2310
2311openssh (1:5.5p1-4) unstable; urgency=low
2312
2313 [ Sebastian Andrzej Siewior ]
2314 * Add powerpcspe to architecture list for libselinux1-dev build-dependency
2315 (closes: #579843).
2316
2317 [ Colin Watson ]
2318 * Allow ~/.ssh/authorized_keys and other secure files to be
2319 group-writable, provided that the group in question contains only the
2320 file's owner; this extends a patch previously applied to ~/.ssh/config
2321 (closes: #581919).
2322 * Check primary group memberships as well as supplementary group
2323 memberships, and only allow group-writability by groups with exactly one
2324 member, as zero-member groups are typically used by setgid binaries
2325 rather than being user-private groups (closes: #581697).
2326
2327 -- Colin Watson <cjwatson@debian.org> Sat, 22 May 2010 23:37:20 +0100
2328
2329openssh (1:5.5p1-3) unstable; urgency=low
2330
2331 * Discard error messages while checking whether rsh, rlogin, and rcp
2332 alternatives exist (closes: #579285).
2333 * Drop IDEA key check; I don't think it works properly any more due to
2334 textual changes in error output, it's only relevant for direct upgrades
2335 from truly ancient versions, and it breaks upgrades if
2336 /etc/ssh/ssh_host_key can't be loaded (closes: #579570).
2337
2338 -- Colin Watson <cjwatson@debian.org> Wed, 28 Apr 2010 22:12:47 +0100
2339
2340openssh (1:5.5p1-2) unstable; urgency=low
2341
2342 * Use dh_installinit -n, since our maintainer scripts already handle this
2343 more carefully (thanks, Julien Cristau).
2344
2345 -- Colin Watson <cjwatson@debian.org> Sat, 17 Apr 2010 12:55:56 +0100
2346
2347openssh (1:5.5p1-1) unstable; urgency=low
2348
2349 * New upstream release:
2350 - Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
2351 paths.
2352 - Include a language tag when sending a protocol 2 disconnection
2353 message.
2354 - Make logging of certificates used for user authentication more clear
2355 and consistent between CAs specified using TrustedUserCAKeys and
2356 authorized_keys.
2357
2358 -- Colin Watson <cjwatson@debian.org> Fri, 16 Apr 2010 10:27:30 +0100
2359
2360openssh (1:5.4p1-2) unstable; urgency=low
2361
2362 * Borrow patch from Fedora to add DNSSEC support: if glibc 2.11 is
2363 installed, the host key is published in an SSHFP RR secured with DNSSEC,
2364 and VerifyHostKeyDNS=yes, then ssh will no longer prompt for host key
2365 verification (closes: #572049).
2366 * Convert to dh(1), and use dh_installdocs --link-doc.
2367 * Drop lpia support, since Ubuntu no longer supports this architecture.
2368 * Use dh_install more effectively.
2369 * Add a NEWS.Debian entry about changes in smartcard support relative to
2370 previous unofficial builds (closes: #231472).
2371
2372 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
2373
2374openssh (1:5.4p1-1) unstable; urgency=low
2375
2376 * New upstream release (LP: #535029).
2377 - After a transition period of about 10 years, this release disables SSH
2378 protocol 1 by default. Clients and servers that need to use the
2379 legacy protocol must explicitly enable it in ssh_config / sshd_config
2380 or on the command-line.
2381 - Remove the libsectok/OpenSC-based smartcard code and add support for
2382 PKCS#11 tokens. This support is enabled by default in the Debian
2383 packaging, since it now doesn't involve additional library
2384 dependencies (closes: #231472, LP: #16918).
2385 - Add support for certificate authentication of users and hosts using a
2386 new, minimal OpenSSH certificate format (closes: #482806).
2387 - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
2388 - Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
2389 package, this overlaps with the key blacklisting facility added in
2390 openssh 1:4.7p1-9, but with different file formats and slightly
2391 different scopes; for the moment, I've roughly merged the two.)
2392 - Various multiplexing improvements, including support for requesting
2393 port-forwardings via the multiplex protocol (closes: #360151).
2394 - Allow setting an explicit umask on the sftp-server(8) commandline to
2395 override whatever default the user has (closes: #496843).
2396 - Many sftp client improvements, including tab-completion, more options,
2397 and recursive transfer support for get/put (LP: #33378). The old
2398 mget/mput commands never worked properly and have been removed
2399 (closes: #270399, #428082).
2400 - Do not prompt for a passphrase if we fail to open a keyfile, and log
2401 the reason why the open failed to debug (closes: #431538).
2402 - Prevent sftp from crashing when given a "-" without a command. Also,
2403 allow whitespace to follow a "-" (closes: #531561).
2404
2405 * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some
2406 patches apply with offsets.
2407 * Include debian/ssh-askpass-gnome.png in the Debian tarball now that
2408 we're using a source format that permits this, rather than messing
2409 around with uudecode.
2410 * Drop compatibility with the old gssapi mechanism used in ssh-krb5 <<
2411 3.8.1p1-1. Simon Wilkinson refused this patch since the old gssapi
2412 mechanism was removed due to a serious security hole, and since these
2413 versions of ssh-krb5 are no longer security-supported by Debian I don't
2414 think there's any point keeping client compatibility for them.
2415 * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
2416 * Hardcode the location of xauth to /usr/bin/xauth rather than
2417 /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440).
2418 xauth no longer depends on x11-common, so we're no longer guaranteed to
2419 have the /usr/bin/X11 symlink available. I was taking advantage of the
2420 /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far
2421 enough in the past now that it's probably safe to just use /usr/bin.
2422 * Remove SSHD_OOM_ADJUST configuration. sshd now unconditionally makes
2423 itself non-OOM-killable, and doesn't require configuration to avoid log
2424 spam in virtualisation containers (closes: #555625).
2425 * Drop Debian-specific removal of OpenSSL version check. Upstream ignores
2426 the two patchlevel nybbles now, which is sufficient to address the
2427 original reason this change was introduced, and it appears that any
2428 change in the major/minor/fix nybbles would involve a new libssl package
2429 name. (We'd still lose if the status nybble were ever changed, but that
2430 would mean somebody had packaged a development/beta version rather than
2431 a proper release, which doesn't appear to be normal practice.)
2432 * Drop most of our "LogLevel SILENT" (-qq) patch. This was originally
2433 introduced to match the behaviour of non-free SSH, in which -q does not
2434 suppress fatal errors, but matching the behaviour of OpenSSH upstream is
2435 much more important nowadays. We no longer document that -q does not
2436 suppress fatal errors (closes: #280609). Migrate "LogLevel SILENT" to
2437 "LogLevel QUIET" in sshd_config on upgrade.
2438 * Policy version 3.8.4:
2439 - Add a Homepage field.
2440
2441 -- Colin Watson <cjwatson@debian.org> Tue, 06 Apr 2010 22:38:31 +0100
2442
2443openssh (1:5.3p1-3) unstable; urgency=low
2444
2445 * Convert to source format 3.0 (quilt).
2446 * Update README.source to match, and add a 'quilt-setup' target to
2447 debian/rules for the benefit of those checking out the package from
2448 revision control.
2449 * All patches are now maintained separately and tagged according to DEP-3.
2450 * Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump.
2451 * Remove documentation of building for Debian 3.0 in README.Debian.
2452 Support for this was removed in 1:4.7p1-2.
2453 * Remove obsolete header from README.Debian dating from when people
2454 expected non-free SSH.
2455 * Update copyright years for GSSAPI patch.
2456
2457 -- Colin Watson <cjwatson@debian.org> Sun, 28 Feb 2010 01:35:53 +0000
2458
2459openssh (1:5.3p1-2) unstable; urgency=low
2460
2461 * Link with -Wl,--as-needed (closes: #560155).
2462 * Install upstream sshd_config as an example (closes: #415008).
2463 * Use dh_lintian.
2464 * Honour DEB_BUILD_OPTIONS=nocheck.
2465
2466 -- Colin Watson <cjwatson@debian.org> Mon, 22 Feb 2010 12:43:24 +0000
2467
2468openssh (1:5.3p1-1) unstable; urgency=low
2469
2470 * New upstream release.
2471 * Update to GSSAPI patch from
2472 http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
2473 * Backport from upstream:
2474 - Do not fall back to adding keys without constraints (ssh-add -c / -t
2475 ...) when the agent refuses the constrained add request. This was a
2476 useful migration measure back in 2002 when constraints were new, but
2477 just adds risk now (LP: #209447).
2478 * Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system
2479 calls. This only applied to Linux 2.2, which it's no longer feasible to
2480 run anyway (see 1:5.2p1-2 changelog).
2481
2482 -- Colin Watson <cjwatson@debian.org> Tue, 26 Jan 2010 11:55:29 +0000
2483
2484openssh (1:5.2p1-2) unstable; urgency=low
2485
2486 [ Colin Watson ]
2487 * Backport from upstream:
2488 - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd
2489 re-execs itself. Prevents two HUPs in quick succession from resulting
2490 in sshd dying (LP: #497781).
2491 - Output a debug if we can't open an existing keyfile (LP: #505301).
2492 * Use host compiler for ssh-askpass-gnome when cross-compiling.
2493 * Don't run tests when cross-compiling.
2494 * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file
2495 descriptor passing when running on Linux 2.0. The previous stable
2496 release of Debian dropped support for Linux 2.4, let alone 2.0, so this
2497 very likely has no remaining users depending on it.
2498
2499 [ Kees Cook ]
2500 * Implement DebianBanner server configuration flag that can be set to "no"
2501 to allow sshd to run without the Debian-specific extra version in the
2502 initial protocol handshake (closes: #562048).
2503
2504 -- Colin Watson <cjwatson@debian.org> Sat, 16 Jan 2010 01:28:58 +0000
2505
2506openssh (1:5.2p1-1) unstable; urgency=low
2507
2508 * New upstream release (closes: #536182). Yes, I know 5.3p1 has been out
2509 for a while, but there's no GSSAPI patch available for it yet.
2510 - Change the default cipher order to prefer the AES CTR modes and the
2511 revised "arcfour256" mode to CBC mode ciphers that are susceptible to
2512 CPNI-957037 "Plaintext Recovery Attack Against SSH".
2513 - Add countermeasures to mitigate CPNI-957037-style attacks against the
2514 SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
2515 packet length or Message Authentication Code, ssh/sshd will continue
2516 reading up to the maximum supported packet length rather than
2517 immediately terminating the connection. This eliminates most of the
2518 known differences in behaviour that leaked information about the
2519 plaintext of injected data which formed the basis of this attack
2520 (closes: #506115, LP: #379329).
2521 - ForceCommand directive now accepts commandline arguments for the
2522 internal-sftp server (closes: #524423, LP: #362511).
2523 - Add AllowAgentForwarding to available Match keywords list (closes:
2524 #540623).
2525 - Make ssh(1) send the correct channel number for
2526 SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
2527 avoid triggering 'Non-public channel' error messages on sshd(8) in
2528 openssh-5.1.
2529 - Avoid printing 'Non-public channel' warnings in sshd(8), since the
2530 ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
2531 behaviour introduced in openssh-5.1; closes: #496017).
2532 - Disable nonfunctional ssh(1) ~C escape handler in multiplex slave
2533 connections (closes: #507541).
2534 - Fix "whitepsace" typo in ssh_config(5) (closes: #514313, LP: #303835).
2535 * Update to GSSAPI patch from
2536 http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
2537 including cascading credentials support (LP: #416958).
2538 * Use x11.pc when compiling/linking gnome-ssh-askpass2 (closes: #555951).
2539 * Moved to bzr.debian.org; add Vcs-Bzr and Vcs-Browser control fields.
2540 * Add debian/README.source with instructions on bzr handling.
2541 * Make ChrootDirectory work with SELinux (thanks, Russell Coker; closes:
2542 #556644).
2543 * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
2544 closes: #498684).
2545 * Don't duplicate backslashes when displaying server banner (thanks,
2546 Michał Górny; closes: #505378, LP: #425346).
2547 * Use hardening-includes for hardening logic (thanks, Kees Cook; closes:
2548 #561887).
2549 * Update OpenSSH FAQ to revision 1.110.
2550 * Remove ssh/new_config, only needed for direct upgrades from potato which
2551 are no longer particularly feasible anyway (closes: #420682).
2552 * Cope with insserv reordering of init script links.
2553 * Remove init script stop link in rc1, as killprocs handles it already.
2554 * Adjust short descriptions to avoid relying on previous experience with
2555 rsh, based on suggestions from Reuben Thomas (closes: #512198).
2556 * Remove manual page references to login.conf, which aren't applicable on
2557 non-BSD systems (closes: #154434).
2558 * Remove/adjust manual page references to BSD-specific /etc/rc (closes:
2559 #513417).
2560 * Refer to sshd_config(5) rather than sshd(8) in postinst-written
2561 /etc/ssh/sshd_config, and add UsePAM commentary from upstream-shipped
2562 configuration file (closes: #415008, although unfortunately this will
2563 only be conveniently visible on new installations).
2564 * Include URL to OpenBSD's ssl(8) in ssh(1), since I don't see a better
2565 source for the same information among Debian's manual pages (closes:
2566 #530692, LP: #456660).
2567
2568 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2010 13:23:35 +0000
2569
2570openssh (1:5.1p1-8) unstable; urgency=low
2571
2572 * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;
2573 closes: #538313).
2574 * Build-depend on libselinux1-dev on sh4 too (thanks, Nobuhiro Iwamatsu;
2575 closes: #547103).
2576 * Fix grammar in if-up script (closes: #549128).
2577 * Pass $SSHD_OPTS when checking configuration too (thanks, "sobtwmxt";
2578 closes: #548662).
2579
2580 -- Colin Watson <cjwatson@debian.org> Mon, 05 Oct 2009 13:30:49 +0100
2581
2582openssh (1:5.1p1-7) unstable; urgency=low
2583
2584 * Update config.guess and config.sub from autotools-dev 20090611.1
2585 (closes: #538301).
2586 * Set umask to 022 in the init script as well as postinsts (closes:
2587 #539030).
2588 * Add ${misc:Depends} to keep Lintian happy.
2589 * Use 'which' rather than 'type' in maintainer scripts.
2590 * Upgrade to debhelper v7.
2591
2592 -- Colin Watson <cjwatson@debian.org> Fri, 31 Jul 2009 16:28:10 +0100
2593
2594openssh (1:5.1p1-6) unstable; urgency=low
2595
2596 * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather
2597 than O_RDWR.
2598 * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes:
2599 #511771).
2600 * Add ufw integration (thanks, Didier Roche; see
2601 https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages;
2602 LP: #261884).
2603 * Add a comment above PermitRootLogin in sshd_config pointing to
2604 README.Debian.
2605 * Check if delgroup is present in openssh-client.postrm (closes: #530501).
2606 * Build with -fPIC on mips/mipsel (thanks, Luk Claes; closes: #531942).
2607 * Remove /var/run/sshd from openssh-server package; it will be created at
2608 run-time before starting the server.
2609 * Use invoke-rc.d in openssh-server's if-up script.
2610
2611 -- Colin Watson <cjwatson@debian.org> Fri, 05 Jun 2009 11:56:03 +0100
2612
2613openssh (1:5.1p1-5) unstable; urgency=low
2614
2615 * Backport from upstream CVS (Markus Friedl):
2616 - packet_disconnect() on padding error, too. Should reduce the success
2617 probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18.
2618 * Check that /var/run/sshd.pid exists and that the process ID listed there
2619 corresponds to sshd before running '/etc/init.d/ssh reload' from if-up
2620 script; SIGHUP is racy if called at boot before sshd has a chance to
2621 install its signal handler, but fortunately the pid file is written
2622 after that which lets us avoid the race (closes: #502444).
2623 * While the above is a valuable sanity-check, it turns out that it doesn't
2624 really fix the bug (thanks to Kevin Price for testing), so for the
2625 meantime we'll just use '/etc/init.d/ssh restart', even though it is
2626 unfortunately heavyweight.
2627
2628 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 00:34:08 +0000
2629
2630openssh (1:5.1p1-4) unstable; urgency=low
2631
2632 * ssh-copy-id: Strip trailing colons from hostname (closes: #226172,
2633 LP: #249706; thanks to Karl Goetz for nudging this along; forwarded
2634 upstream as https://bugzilla.mindrot.org/show_bug.cgi?id=1530).
2635 * Backport from upstream CVS (Markus Friedl):
2636 - Only send eow and no-more-sessions requests to openssh 5 and newer;
2637 fixes interop problems with broken ssh v2 implementations (closes:
2638 #495917).
2639 * Fix double-free when failing to parse a forwarding specification given
2640 using ~C (closes: #505330; forwarded upstream as
2641 https://bugzilla.mindrot.org/show_bug.cgi?id=1539).
2642
2643 -- Colin Watson <cjwatson@debian.org> Sun, 23 Nov 2008 14:46:10 +0000
2644
2645openssh (1:5.1p1-3) unstable; urgency=low
2646
2647 * Remove unnecessary ssh-vulnkey output in non-verbose mode when no
2648 compromised or unknown keys were found (closes: #496495).
2649 * Configure with --disable-strip; dh_strip will deal with stripping
2650 binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
2651 closes: #498681).
2652 * Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
2653 #497026).
2654
2655 -- Colin Watson <cjwatson@debian.org> Tue, 30 Sep 2008 23:09:58 +0100
2656
2657openssh (1:5.1p1-2) unstable; urgency=low
2658
2659 * Look for $SHELL on the path when executing ProxyCommands or
2660 LocalCommands (closes: #492728).
2661
2662 -- Colin Watson <cjwatson@debian.org> Tue, 29 Jul 2008 15:31:25 +0100
2663
2664openssh (1:5.1p1-1) unstable; urgency=low
2665
2666 * New upstream release (closes: #474301). Important changes not previously
2667 backported to 4.7p1:
2668 - 4.9/4.9p1 (http://www.openssh.com/txt/release-4.9):
2669 + Added chroot(2) support for sshd(8), controlled by a new option
2670 "ChrootDirectory" (closes: #139047, LP: #24777).
2671 + Linked sftp-server(8) into sshd(8). The internal sftp server is used
2672 when the command "internal-sftp" is specified in a Subsystem or
2673 ForceCommand declaration. When used with ChrootDirectory, the
2674 internal sftp server requires no special configuration of files
2675 inside the chroot environment.
2676 + Added a protocol extension method "posix-rename@openssh.com" for
2677 sftp-server(8) to perform POSIX atomic rename() operations; sftp(1)
2678 prefers this if available (closes: #308561).
2679 + Removed the fixed limit of 100 file handles in sftp-server(8).
2680 + ssh(8) will now skip generation of SSH protocol 1 ephemeral server
2681 keys when in inetd mode and protocol 2 connections are negotiated.
2682 This speeds up protocol 2 connections to inetd-mode servers that
2683 also allow Protocol 1.
2684 + Accept the PermitRootLogin directive in a sshd_config(5) Match
2685 block. Allows for, e.g. permitting root only from the local network.
2686 + Reworked sftp(1) argument splitting and escaping to be more
2687 internally consistent (i.e. between sftp commands) and more
2688 consistent with sh(1). Please note that this will change the
2689 interpretation of some quoted strings, especially those with
2690 embedded backslash escape sequences.
2691 + Support "Banner=none" in sshd_config(5) to disable sending of a
2692 pre-login banner (e.g. in a Match block).
2693 + ssh(1) ProxyCommands are now executed with $SHELL rather than
2694 /bin/sh.
2695 + ssh(1)'s ConnectTimeout option is now applied to both the TCP
2696 connection and the SSH banner exchange (previously it just covered
2697 the TCP connection). This allows callers of ssh(1) to better detect
2698 and deal with stuck servers that accept a TCP connection but don't
2699 progress the protocol, and also makes ConnectTimeout useful for
2700 connections via a ProxyCommand.
2701 + scp(1) incorrectly reported "stalled" on slow copies (closes:
2702 #140828).
2703 + scp(1) date underflow for timestamps before epoch.
2704 + ssh(1) used the obsolete SIG DNS RRtype for host keys in DNS,
2705 instead of the current standard RRSIG.
2706 + Correctly drain ACKs when a sftp(1) upload write fails midway,
2707 avoids a fatal() exit from what should be a recoverable condition.
2708 + Fixed ssh-keygen(1) selective host key hashing (i.e. "ssh-keygen -HF
2709 hostname") to not include any IP address in the data to be hashed.
2710 + Make ssh(1) skip listening on the IPv6 wildcard address when a
2711 binding address of 0.0.0.0 is used against an old SSH server that
2712 does not support the RFC4254 syntax for wildcard bind addresses.
2713 + Enable IPV6_V6ONLY socket option on sshd(8) listen socket, as is
2714 already done for X11/TCP forwarding sockets (closes: #439661).
2715 + Fix FD leak that could hang a ssh(1) connection multiplexing master.
2716 + Make ssh(1) -q option documentation consistent with reality.
2717 + Fixed sshd(8) PAM support not calling pam_session_close(), or
2718 failing to call it with root privileges (closes: #372680).
2719 + Fix activation of OpenSSL engine support when requested in configure
2720 (LP: #119295).
2721 + Cache SELinux status earlier so we know if it's enabled after a
2722 chroot (LP: #237557).
2723 - 5.1/5.1p1 (http://www.openssh.com/txt/release-5.1):
2724 + Introduce experimental SSH Fingerprint ASCII Visualisation to ssh(1)
2725 and ssh-keygen(1). Visual fingerprint display is controlled by a new
2726 ssh_config(5) option "VisualHostKey". The intent is to render SSH
2727 host keys in a visual form that is amenable to easy recall and
2728 rejection of changed host keys.
2729 + sshd_config(5) now supports CIDR address/masklen matching in "Match
2730 address" blocks, with a fallback to classic wildcard matching.
2731 + sshd(8) now supports CIDR matching in ~/.ssh/authorized_keys
2732 from="..." restrictions, also with a fallback to classic wildcard
2733 matching.
2734 + Added an extended test mode (-T) to sshd(8) to request that it write
2735 its effective configuration to stdout and exit. Extended test mode
2736 also supports the specification of connection parameters (username,
2737 source address and hostname) to test the application of
2738 sshd_config(5) Match rules.
2739 + ssh(1) now prints the number of bytes transferred and the overall
2740 connection throughput for SSH protocol 2 sessions when in verbose
2741 mode (previously these statistics were displayed for protocol 1
2742 connections only).
2743 + sftp-server(8) now supports extension methods statvfs@openssh.com
2744 and fstatvfs@openssh.com that implement statvfs(2)-like operations.
2745 + sftp(1) now has a "df" command to the sftp client that uses the
2746 statvfs@openssh.com to produce a df(1)-like display of filesystem
2747 space and inode utilisation (requires statvfs@openssh.com support on
2748 the server).
2749 + Added a MaxSessions option to sshd_config(5) to allow control of the
2750 number of multiplexed sessions supported over a single TCP
2751 connection. This allows increasing the number of allowed sessions
2752 above the previous default of 10, disabling connection multiplexing
2753 (MaxSessions=1) or disallowing login/shell/subsystem sessions
2754 entirely (MaxSessions=0).
2755 + Added a no-more-sessions@openssh.com global request extension that
2756 is sent from ssh(1) to sshd(8) when the client knows that it will
2757 never request another session (i.e. when session multiplexing is
2758 disabled). This allows a server to disallow further session requests
2759 and terminate the session in cases where the client has been
2760 hijacked.
2761 + ssh-keygen(1) now supports the use of the -l option in combination
2762 with -F to search for a host in ~/.ssh/known_hosts and display its
2763 fingerprint.
2764 + ssh-keyscan(1) now defaults to "rsa" (protocol 2) keys, instead of
2765 "rsa1" (LP: #129794).
2766 + Added an AllowAgentForwarding option to sshd_config(8) to control
2767 whether authentication agent forwarding is permitted. Note that this
2768 is a loose control, as a client may install their own unofficial
2769 forwarder.
2770 + ssh(1) and sshd(8): avoid unnecessary malloc/copy/free when
2771 receiving network data, resulting in a ~10% speedup.
2772 + ssh(1) and sshd(8) will now try additional addresses when connecting
2773 to a port forward destination whose DNS name resolves to more than
2774 one address. The previous behaviour was to try the only first
2775 address and give up if that failed.
2776 + ssh(1) and sshd(8) now support signalling that channels are
2777 half-closed for writing, through a channel protocol extension
2778 notification "eow@openssh.com". This allows propagation of closed
2779 file descriptors, so that commands such as "ssh -2 localhost od
2780 /bin/ls | true" do not send unnecessary data over the wire.
2781 + sshd(8): increased the default size of ssh protocol 1 ephemeral keys
2782 from 768 to 1024 bits.
2783 + When ssh(1) has been requested to fork after authentication ("ssh
2784 -f") with ExitOnForwardFailure enabled, delay the fork until after
2785 replies for any -R forwards have been seen. Allows for robust
2786 detection of -R forward failure when using -f.
2787 + "Match group" blocks in sshd_config(5) now support negation of
2788 groups. E.g. "Match group staff,!guests".
2789 + sftp(1) and sftp-server(8) now allow chmod-like operations to set
2790 set[ug]id/sticky bits.
2791 + The MaxAuthTries option is now permitted in sshd_config(5) match
2792 blocks.
2793 + Multiplexed ssh(1) sessions now support a subset of the ~ escapes
2794 that are available to a primary connection.
2795 + ssh(1) connection multiplexing will now fall back to creating a new
2796 connection in most error cases (closes: #352830).
2797 + Make ssh(1) deal more gracefully with channel requests that fail.
2798 Previously it would optimistically assume that requests would always
2799 succeed, which could cause hangs if they did not (e.g. when the
2800 server runs out of file descriptors).
2801 + ssh(1) now reports multiplexing errors via the multiplex slave's
2802 stderr where possible (subject to LogLevel in the mux master).
2803 + Fixed an UMAC alignment problem that manifested on Itanium
2804 platforms.
2805 * Remove our local version of moduli(5) now that there's one upstream.
2806 * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description.
2807 * Add lintian overrides for empty /usr/share/doc/openssh-client
2808 directories in openssh-server and ssh (necessary due to being symlink
2809 targets).
2810 * Merge from Ubuntu:
2811 - Add 'status' action to openssh-server init script, requiring lsb-base
2812 (>= 3.2-13) (thanks, Dustin Kirkland).
2813 * debconf template translations:
2814 - Update Korean (thanks, Sunjae Park; closes: #484821).
2815
2816 -- Colin Watson <cjwatson@debian.org> Fri, 25 Jul 2008 10:45:08 +0100
2817
2818openssh (1:4.7p1-13) unstable; urgency=low
2819
2820 * Add some helpful advice to the end of ssh-vulnkey's output if there are
2821 unknown or compromised keys (thanks, Dan Jacobson; closes: #483756).
2822 * Check compromised key blacklist in ssh or ssh-add, as well as in the
2823 server (LP: #232391). To override the blacklist check in ssh
2824 temporarily, use 'ssh -o UseBlacklistedKeys=yes'; there is no override
2825 for the blacklist check in ssh-add.
2826 * Add cross-references to ssh-vulnkey(1) to ssh(1), ssh-add(1),
2827 ssh-keygen(1), and sshd(8) (closes: #484451).
2828 * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999
2829 (thanks, Frans Pop).
2830 * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now
2831 takes care of that (thanks, Frans Pop; closes: #484404).
2832 * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0.
2833 * Add documentation on removing openssh-blacklist locally (see #484269).
2834 * Clarify documentation of SSHD_OOM_ADJUST, and make setting it to the
2835 empty string actually skip adjustment as intended (closes: #487325).
2836 * Remove empty /usr/share/applications directory in ssh-askpass-gnome.
2837 * debconf template translations:
2838 - Update Romanian (thanks, Cătălin Feștilă; closes: #485415).
2839
2840 -- Colin Watson <cjwatson@debian.org> Mon, 21 Jul 2008 12:18:28 +0100
2841
2842openssh (1:4.7p1-12) unstable; urgency=low
2843
2844 * Fill in CVE identifier for ssh-vulnkey bug fixed in 1:4.7p1-10.
2845 * Refactor rejection of blacklisted user keys into a single
2846 reject_blacklisted_key function in auth.c (thanks, Dmitry V. Levin).
2847 * Fix memory leak of blacklisted host keys (thanks, Dmitry V. Levin).
2848 * debconf template translations:
2849 - Update Dutch (thanks, Bart Cornelis; closes: #483004).
2850 - Update Brazilian Portuguese (thanks, Eder L. Marques; closes:
2851 #483142).
2852 - Update Slovak (thanks, Ivan Masár; closes: #483517).
2853
2854 -- Colin Watson <cjwatson@debian.org> Thu, 29 May 2008 21:41:29 +0100
2855
2856openssh (1:4.7p1-11) unstable; urgency=low
2857
2858 * Make init script depend on $syslog, and fix some other dependency
2859 glitches (thanks, Petter Reinholdtsen; closes: #481018).
2860 * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman;
2861 closes: #481151).
2862 * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;
2863 closes: #480020).
2864 * Allow building with heimdal-dev (LP: #125805).
2865
2866 * Check RSA1 keys without the need for a separate blacklist. Thanks to
2867 Simon Tatham for the idea.
2868 * Generate two keys with the PID forced to the same value and test that
2869 they differ, to defend against recurrences of the recent Debian OpenSSL
2870 vulnerability.
2871 * Recommend openssh-blacklist from openssh-client (closes: #481187).
2872 * Recommend openssh-blacklist-extra from openssh-client and
2873 openssh-server.
2874 * Make ssh-vulnkey report the file name and line number for each key
2875 (thanks, Heiko Schlittermann and Christopher Perry; closes: #481398).
2876 * Check for blacklists in /usr/share/ssh/ as well as /etc/ssh/ (see
2877 #481283).
2878 * Log IP addresses of hosts attempting to use blacklisted keys (closes:
2879 #481721).
2880 * Incorporate various ssh-vulnkey suggestions from Hugh Daniel:
2881 - Add -v (verbose) option, and don't print output for keys that have a
2882 blacklist file but that are not listed unless in verbose mode.
2883 - Move exit status documentation to a separate section.
2884 - Document key status descriptions.
2885 - Add key type to output.
2886 - Fix error output if ssh-vulnkey fails to read key files, with the
2887 exception of host keys unless -a was given.
2888 - In verbose mode, output the name of each file examined.
2889 * Handle leading IP addresses in ssh-vulnkey input (LP: #230497).
2890 * Fix various ssh-vulnkey problems pointed out by Solar Designer:
2891 - Fix some buffer handling inconsistencies.
2892 - Use xasprintf to build user key file names, avoiding truncation
2893 problems.
2894 - Drop to the user's UID when reading user keys with -a.
2895 - Use EUID rather than UID when run with no file names and without -a.
2896 - Reword "Unknown (no blacklist information)" to "Unknown (blacklist
2897 file not installed)".
2898
2899 * Fix typo in ssh/vulnerable_host_keys message (thanks, Esko Arajärvi).
2900 * debconf template translations:
2901 - Update Finnish (thanks, Esko Arajärvi; closes: #481530).
2902 - Update French (thanks, Christian Perrier; closes: #481576).
2903 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #481591).
2904 - Update Galician (thanks, Jacobo Tarrio; closes: #481596).
2905 - Update Japanese (thanks, Kenshi Muto; closes: #481621).
2906 - Update Czech (thanks, Miroslav Kure; closes: #481624).
2907 - Update German (thanks, Helge Kreutzmann; closes: #481676).
2908 - Update Portuguese (thanks, Ricardo Silva; closes: #481781).
2909 - Update Basque (thanks, Piarres Beobide; closes: #481836).
2910 - Update Bulgarian (thanks, Damyan Ivanov; closes: #481870).
2911 - Update Vietnamese (thanks, Clytie Siddall; closes: #481876).
2912 - Update Spanish (thanks, Javier Fernandez-Sanguino Peña; closes:
2913 #482341).
2914 - Update Turkish (thanks, Mert Dirik; closes: #482548).
2915 - Update Russian (thanks, Yuri Kozlov; closes: #482887).
2916 - Update Swedish (thanks, Martin Bagge; closes: #482464).
2917 - Update Italian (thanks, Luca Monducci; closes: #482808).
2918
2919 -- Colin Watson <cjwatson@debian.org> Mon, 26 May 2008 12:21:39 +0100
2920
2921openssh (1:4.7p1-10) unstable; urgency=low
2922
2923 * Add a FILES section to ssh-vulnkey(1) (thanks, Hugh Daniel).
2924 * CVE-2008-2285: ssh-vulnkey handles options in authorized_keys
2925 (LP: #230029), and treats # as introducing a comment even if it is
2926 preceded by whitespace.
2927
2928 -- Colin Watson <cjwatson@debian.org> Wed, 14 May 2008 12:35:05 +0100
2929
2930openssh (1:4.7p1-9) unstable; urgency=critical
2931
2932 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-8.
2933 * Mitigate OpenSSL security vulnerability (CVE-2008-0166):
2934 - Add key blacklisting support. Keys listed in
2935 /etc/ssh/blacklist.TYPE-LENGTH will be rejected for authentication by
2936 sshd, unless "PermitBlacklistedKeys yes" is set in
2937 /etc/ssh/sshd_config.
2938 - Add a new program, ssh-vulnkey, which can be used to check keys
2939 against these blacklists.
2940 - Depend on openssh-blacklist.
2941 - Force dependencies on libssl0.9.8 / libcrypto0.9.8-udeb to at least
2942 0.9.8g-9.
2943 - Automatically regenerate known-compromised host keys, with a
2944 critical-priority debconf note. (I regret that there was no time to
2945 gather translations.)
2946
2947 -- Colin Watson <cjwatson@debian.org> Tue, 13 May 2008 12:33:38 +0100
2948
2949openssh (1:4.7p1-8) unstable; urgency=high
2950
2951 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5.
2952 * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old
2953 configurations (LP: #211400).
2954 * Tweak scp's reporting of filenames in verbose mode to be a bit less
2955 confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945).
2956 * Backport from 4.9p1:
2957 - CVE-2008-1657: Ignore ~/.ssh/rc if a sshd_config ForceCommand is
2958 specified.
2959 - Add no-user-rc authorized_keys option to disable execution of
2960 ~/.ssh/rc.
2961 * Backport from Simon Wilkinson's GSSAPI key exchange patch for 5.0p1:
2962 - Add code to actually implement GSSAPIStrictAcceptorCheck, which had
2963 somehow been omitted from a previous version of this patch (closes:
2964 #474246).
2965
2966 -- Colin Watson <cjwatson@debian.org> Sun, 06 Apr 2008 12:34:19 +0100
2967
2968openssh (1:4.7p1-7) unstable; urgency=low
2969
2970 * Ignore errors writing to oom_adj (closes: #473573).
2971
2972 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2008 16:24:44 +0100
2973
2974openssh (1:4.7p1-6) unstable; urgency=low
2975
2976 * Disable the Linux kernel's OOM-killer for the sshd parent; tweak
2977 SSHD_OOM_ADJUST in /etc/default/ssh to change this (closes: #341767).
2978
2979 -- Colin Watson <cjwatson@debian.org> Sun, 30 Mar 2008 21:14:12 +0100
2980
2981openssh (1:4.7p1-5) unstable; urgency=low
2982
2983 * Recommends: xauth rather than Suggests: xbase-clients.
2984 * Document in ssh(1) that '-S none' disables connection sharing
2985 (closes: #471437).
2986 * Patch from Red Hat / Fedora:
2987 - CVE-2008-1483: Don't use X11 forwarding port which can't be bound on
2988 all address families, preventing hijacking of X11 forwarding by
2989 unprivileged users when both IPv4 and IPv6 are configured (closes:
2990 #463011).
2991 * Use printf rather than echo -en (a bashism) in openssh-server.config and
2992 openssh-server.preinst.
2993 * debconf template translations:
2994 - Update Finnish (thanks, Esko Arajärvi; closes: #468563).
2995
2996 -- Colin Watson <cjwatson@debian.org> Sat, 22 Mar 2008 12:37:00 +0000
2997
2998openssh (1:4.7p1-4) unstable; urgency=low
2999
3000 [ Caleb Case ]
3001 * Fix configure detection of getseuserbyname and
3002 get_default_context_with_level (closes: #465614, LP: #188136).
3003
3004 [ Colin Watson ]
3005 * Include the autogenerated debian/copyright in the source package.
3006 * Move /etc/pam.d/ssh to /etc/pam.d/sshd, allowing us to stop defining
3007 SSHD_PAM_SERVICE (closes: #255870).
3008
3009 -- Colin Watson <cjwatson@debian.org> Wed, 13 Feb 2008 18:18:52 +0000
3010
3011openssh (1:4.7p1-3) unstable; urgency=low
3012
3013 * Improve grammar of ssh-askpass-gnome description.
3014 * Backport from upstream:
3015 - Use the correct packet maximum sizes for remote port and agent
3016 forwarding. Prevents the server from killing the connection if too
3017 much data is queued and an excessively large packet gets sent
3018 (https://bugzilla.mindrot.org/show_bug.cgi?id=1360).
3019 * Allow passing temporary daemon parameters on the init script's command
3020 line, e.g. '/etc/init.d/ssh start "-o PermitRootLogin=yes"' (thanks,
3021 Marc Haber; closes: #458547).
3022
3023 -- Colin Watson <cjwatson@debian.org> Fri, 01 Feb 2008 21:59:59 +0000
3024
3025openssh (1:4.7p1-2) unstable; urgency=low
3026
3027 * Adjust many relative links in faq.html to point to
3028 http://www.openssh.com/ (thanks, Dan Jacobson; mentioned in #459807).
3029 * Pass --with-mantype=doc to configure rather than build-depending on
3030 groff (closes: #460121).
3031 * Add armel to architecture list for libselinux1-dev build-dependency
3032 (closes: #460136).
3033 * Drop source-compatibility with Debian 3.0:
3034 - Remove support for building with GNOME 1. This allows simplification
3035 of our GNOME build-dependencies (see #460136).
3036 - Remove hacks to support the old PAM configuration scheme.
3037 - Remove compatibility for building without po-debconf.
3038 * Build-depend on libgtk2.0-dev rather than libgnomeui-dev. As far as I
3039 can see, the GTK2 version of ssh-askpass-gnome has never required
3040 libgnomeui-dev.
3041
3042 -- Colin Watson <cjwatson@debian.org> Fri, 11 Jan 2008 00:14:10 +0000
3043
3044openssh (1:4.7p1-1) unstable; urgency=low
3045
3046 * New upstream release (closes: #453367).
3047 - CVE-2007-4752: Prevent ssh(1) from using a trusted X11 cookie if
3048 creation of an untrusted cookie fails; found and fixed by Jan Pechanec
3049 (closes: #444738).
3050 - sshd(8) in new installations defaults to SSH Protocol 2 only. Existing
3051 installations are unchanged.
3052 - The SSH channel window size has been increased, and both ssh(1)
3053 sshd(8) now send window updates more aggressively. These improves
3054 performance on high-BDP (Bandwidth Delay Product) networks.
3055 - ssh(1) and sshd(8) now preserve MAC contexts between packets, which
3056 saves 2 hash calls per packet and results in 12-16% speedup for
3057 arcfour256/hmac-md5.
3058 - A new MAC algorithm has been added, UMAC-64 (RFC4418) as
3059 "umac-64@openssh.com". UMAC-64 has been measured to be approximately
3060 20% faster than HMAC-MD5.
3061 - Failure to establish a ssh(1) TunnelForward is now treated as a fatal
3062 error when the ExitOnForwardFailure option is set.
3063 - ssh(1) returns a sensible exit status if the control master goes away
3064 without passing the full exit status.
3065 - When using a ProxyCommand in ssh(1), set the outgoing hostname with
3066 gethostname(2), allowing hostbased authentication to work.
3067 - Make scp(1) skip FIFOs rather than hanging (closes: #246774).
3068 - Encode non-printing characters in scp(1) filenames. These could cause
3069 copies to be aborted with a "protocol error".
3070 - Handle SIGINT in sshd(8) privilege separation child process to ensure
3071 that wtmp and lastlog records are correctly updated.
3072 - Report GSSAPI mechanism in errors, for libraries that support multiple
3073 mechanisms.
3074 - Improve documentation for ssh-add(1)'s -d option.
3075 - Rearrange and tidy GSSAPI code, removing server-only code being linked
3076 into the client.
3077 - Delay execution of ssh(1)'s LocalCommand until after all forwardings
3078 have been established.
3079 - In scp(1), do not truncate non-regular files.
3080 - Improve exit message from ControlMaster clients.
3081 - Prevent sftp-server(8) from reading until it runs out of buffer space,
3082 whereupon it would exit with a fatal error (closes: #365541).
3083 - pam_end() was not being called if authentication failed
3084 (closes: #405041).
3085 - Manual page datestamps updated (closes: #433181).
3086 * Install the OpenSSH FAQ in /usr/share/doc/openssh-client.
3087 - Includes documentation on copying files with colons using scp
3088 (closes: #303453).
3089 * Create /var/run/sshd on start even if /etc/ssh/sshd_not_to_be_run exists
3090 (closes: #453285).
3091 * Fix "overriden" typo in ssh(1) (thanks, A. Costa; closes: #390699).
3092 * Refactor debian/rules configure and make invocations to make development
3093 easier.
3094 * Remove the hideously old /etc/ssh/primes on upgrade (closes: #123013).
3095 * Update moduli(5) to revision 1.11 from OpenBSD CVS.
3096 * Document the non-default options we set as standard in ssh_config(5) and
3097 sshd_config(5) (closes: #327886, #345628).
3098 * Recode LICENCE to UTF-8 when concatenating it to debian/copyright.
3099 * Override desktop-file-but-no-dh_desktop-call lintian warning; the
3100 .desktop file is intentionally not installed (see 1:3.8.1p1-10).
3101 * Update copyright dates for Kerberos patch in debian/copyright.head.
3102 * Policy version 3.7.3: no changes required.
3103
3104 -- Colin Watson <cjwatson@debian.org> Mon, 24 Dec 2007 16:43:02 +0000
3105
3106openssh (1:4.6p1-7) unstable; urgency=low
3107
3108 * Don't build PIE executables on m68k (closes: #451192).
3109 * Use autotools-dev's recommended configure --build and --host options.
3110 * Adjust README.Debian to suggest mailing debian-ssh@lists.debian.org
3111 rather than Matthew.
3112 * Check whether deluser exists in postrm (closes: #454085).
3113
3114 -- Colin Watson <cjwatson@debian.org> Mon, 03 Dec 2007 11:11:02 +0000
3115
3116openssh (1:4.6p1-6) unstable; urgency=low
3117
3118 * Remove blank line between head comment and first template in
3119 debian/openssh-server.templates.master; apparently it confuses some
3120 versions of debconf.
3121 * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas
3122 Pospisek; closes: #441817).
3123 * Discard error output from dpkg-query in preinsts, in case the ssh
3124 metapackage is not installed.
3125 * Fix sshd/inittab advice in README.Debian to account for rc.d movement
3126 (closes: #450632).
3127 * Suppress error from debian/rules if lsb-release is not installed.
3128 * Don't ignore errors from 'make -C contrib clean'.
3129 * Adjust categories in ssh-askpass-gnome.desktop to comply with the
3130 Desktop Menu Specification.
3131 * debconf template translations:
3132 - Add Slovak (thanks, Ivan Masár; closes: #441690).
3133 - Update Brazilian Portuguese (thanks, Eder L. Marques;
3134 closes: #447145).
3135
3136 -- Colin Watson <cjwatson@debian.org> Mon, 12 Nov 2007 11:47:28 +0000
3137
3138openssh (1:4.6p1-5) unstable; urgency=low
3139
3140 * Identify ssh as a metapackage rather than a transitional package. It's
3141 still useful as a quick way to install both the client and the server.
3142 * ssh-copy-id now checks the exit status of ssh-add -L (thanks, Adeodato
3143 Simó; closes: #221675).
3144 * ssh-copy-id no longer prints the output of expr (thanks, Peter
3145 Eisentraut; closes: #291534).
3146 * ssh-copy-id defaults to ~/.ssh/id_rsa.pub rather than
3147 ~/.ssh/identity.pub, in line with ssh-keygen (thanks, Greg Norris;
3148 closes: #234627).
3149 * Build-depend on libselinux1-dev on lpia.
3150 * openssh-client Suggests: keychain.
3151 * debconf template translations:
3152 - Update Catalan (thanks, Jordà Polo; closes: #431970).
3153
3154 -- Colin Watson <cjwatson@debian.org> Mon, 30 Jul 2007 09:34:38 +0100
3155
3156openssh (1:4.6p1-4) unstable; urgency=low
3157
3158 * Don't build PIE executables on hppa, as they crash.
3159
3160 -- Colin Watson <cjwatson@debian.org> Thu, 05 Jul 2007 11:06:54 +0100
3161
3162openssh (1:4.6p1-3) unstable; urgency=low
3163
3164 * Only build PIE executables on Linux and NetBSD (closes: #430455).
3165 * Fix broken switch fallthrough when SELinux is running in permissive mode
3166 (closes: #430838).
3167 * Document that HashKnownHosts may break tab-completion (closes: #430154).
3168
3169 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jun 2007 07:15:38 +0100
3170
3171openssh (1:4.6p1-2) unstable; urgency=low
3172
3173 * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
3174 * Clarify that 'ssh -q -q' still prints errors caused by bad arguments
3175 (i.e. before the logging system is initialised).
3176 * Suppress "Connection to <host> closed" and "Connection to master closed"
3177 messages at loglevel SILENT (thanks, Jaap Eldering; closes: #409788).
3178 * Suppress "Pseudo-terminal will not be allocated because stdin is not a
3179 terminal" message at loglevels QUIET and SILENT (closes: #366814).
3180 * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and
3181 sshd_config(5).
3182 * Add try-restart action to init script.
3183 * Add /etc/network/if-up.d/openssh-server to restart sshd when new
3184 interfaces appear (LP: #103436).
3185 * Backport from upstream:
3186 - Move C/R -> kbdint special case to after the defaults have been
3187 loaded, which makes ChallengeResponse default to yes again. This was
3188 broken by the Match changes and not fixed properly subsequently
3189 (closes: #428968).
3190 - Silence spurious error messages from hang-on-exit fix
3191 (http://bugzilla.mindrot.org/show_bug.cgi?id=1306, closes: #429531).
3192
3193 -- Colin Watson <cjwatson@debian.org> Wed, 20 Jun 2007 11:52:44 +0100
3194
3195openssh (1:4.6p1-1) unstable; urgency=low
3196
3197 * New upstream release (closes: #395507, #397961, #420035). Important
3198 changes not previously backported to 4.3p2:
3199 - 4.4/4.4p1 (http://www.openssh.com/txt/release-4.4):
3200 + On portable OpenSSH, fix a GSSAPI authentication abort that could be
3201 used to determine the validity of usernames on some platforms.
3202 + Implemented conditional configuration in sshd_config(5) using the
3203 "Match" directive. This allows some configuration options to be
3204 selectively overridden if specific criteria (based on user, group,
3205 hostname and/or address) are met. So far a useful subset of
3206 post-authentication options are supported and more are expected to
3207 be added in future releases.
3208 + Add support for Diffie-Hellman group exchange key agreement with a
3209 final hash of SHA256.
3210 + Added a "ForceCommand" directive to sshd_config(5). Similar to the
3211 command="..." option accepted in ~/.ssh/authorized_keys, this forces
3212 the execution of the specified command regardless of what the user
3213 requested. This is very useful in conjunction with the new "Match"
3214 option.
3215 + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
3216 permitopen="..." authorized_keys option, allowing fine-grained
3217 control over the port-forwardings that a user is allowed to
3218 establish.
3219 + Add optional logging of transactions to sftp-server(8).
3220 + ssh(1) will now record port numbers for hosts stored in
3221 ~/.ssh/known_hosts when a non-standard port has been requested
3222 (closes: #50612).
3223 + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
3224 non-zero exit code) when requested port forwardings could not be
3225 established.
3226 + Extend sshd_config(5) "SubSystem" declarations to allow the
3227 specification of command-line arguments.
3228 + Replacement of all integer overflow susceptible invocations of
3229 malloc(3) and realloc(3) with overflow-checking equivalents.
3230 + Many manpage fixes and improvements.
3231 + Add optional support for OpenSSL hardware accelerators (engines),
3232 enabled using the --with-ssl-engine configure option.
3233 + Tokens in configuration files may be double-quoted in order to
3234 contain spaces (closes: #319639).
3235 + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
3236 session exits very quickly (closes: #307890).
3237 + Fix some incorrect buffer allocation calculations (closes: #410599).
3238 + ssh-add doesn't ask for a passphrase if key file permissions are too
3239 liberal (closes: #103677).
3240 + Likewise, ssh doesn't ask either (closes: #99675).
3241 - 4.6/4.6p1 (http://www.openssh.com/txt/release-4.6):
3242 + sshd now allows the enabling and disabling of authentication methods
3243 on a per user, group, host and network basis via the Match directive
3244 in sshd_config.
3245 + Fixed an inconsistent check for a terminal when displaying scp
3246 progress meter (closes: #257524).
3247 + Fix "hang on exit" when background processes are running at the time
3248 of exit on a ttyful/login session (closes: #88337).
3249 * Update to current GSSAPI patch from
3250 http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
3251 install ChangeLog.gssapi.
3252 * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295).
3253 * Use LSB functions in init scripts, and add an LSB-style header (partly
3254 from Ubuntu and partly thanks to Christian Perrier; closes: #389038).
3255 * Move init script start links to S16, move rc1 stop link to K84, and
3256 remove rc0 and rc6 stop links altogether (the last part from Ubuntu;
3257 closes: #122188).
3258 * Emit a slightly more informative message from the init script if
3259 /dev/null has somehow become not a character device (closes: #369964).
3260 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
3261 * Merge from Ubuntu:
3262 - Build position-independent executables (only for debs, not for udebs)
3263 to take advantage of address space layout randomisation.
3264 - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to
3265 the default path.
3266 * Use ${binary:Version} rather than ${Source-Version} in openssh-server ->
3267 openssh-client dependency.
3268
3269 -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:28:26 +0100
3270
3271openssh (1:4.3p2-11) unstable; urgency=low
3272
3273 * It's been four and a half years now since I took over as "temporary"
3274 maintainer, so the Maintainer field is getting a bit inaccurate. Set
3275 Maintainer to debian-ssh@lists.debian.org and leave Matthew and myself
3276 as Uploaders.
3277 * Use dpkg-query to fetch conffile md5sums rather than parsing
3278 /var/lib/dpkg/status directly.
3279 * openssh-client Suggests: libpam-ssh (closes: #427840).
3280 * Use 'start-stop-daemon --oknodo' so that openssh-server's init script
3281 exits successfully if sshd is already running (closes: #426858).
3282
3283 * Apply results of debconf templates and package descriptions review by
3284 debian-l10n-english (closes: #420107, #420742).
3285 * debconf template translations:
3286 - Update Dutch (thanks, Machteld de Kok; closes: #419260).
3287 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #420630).
3288 - Update Galician (thanks, Jacobo Tarrio; closes: #420635).
3289 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
3290 closes: #420651).
3291 - Update Swedish (thanks, Daniel Nylander; closes: #420663).
3292 - Add Bulgarian (thanks, Damyan Ivanov; closes: #420703).
3293 - Add Tamil (thanks, Tirumurti Vasudevan; closes: #420739).
3294 - Update German (thanks, Helge Kreutzmann; closes: #420743).
3295 - Update Japanese (thanks, Kenshi Muto; closes: #420946).
3296 - Add Basque (thanks, Piarres Beobide; closes: #421238).
3297 - Update Italian (thanks, Luca Monducci; closes: #421348).
3298 - Update Czech (thanks, Miroslav Kure; closes: #421484).
3299 - Update Romanian (thanks, Igor Stirbu; closes: #421760).
3300 - Update Russian (thanks, Yuriy Talakan' and Sergey Alyoshin;
3301 closes: #420862).
3302 - Update Dutch (thanks, Bart Cornelis; closes: #422767).
3303 - Update Portuguese (thanks, Ricardo Silva; closes: #423112).
3304 - Update French (thanks, Christian Perrier).
3305 - Add Korean (thanks, Sunjae Park; closes: #424008).
3306 - Update Vietnamese (thanks, Clytie Siddall; closes: #426991).
3307
3308 -- Colin Watson <cjwatson@debian.org> Sun, 10 Jun 2007 08:59:42 +0100
3309
3310openssh (1:4.3p2-10) unstable; urgency=low
3311
3312 * Multiply openssh-client-udeb's Installer-Menu-Item by 100.
3313 * Increase MAX_SESSIONS to 64.
3314
3315 -- Colin Watson <cjwatson@debian.org> Tue, 10 Apr 2007 19:17:20 +0100
3316
3317openssh (1:4.3p2-9) unstable; urgency=high
3318
3319 [ Russ Allbery ]
3320 * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5
3321 (closes: #404863).
3322 * Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).
3323
3324 [ Colin Watson ]
3325 * debconf template translations:
3326 - Add Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #412330).
3327
3328 -- Colin Watson <cjwatson@debian.org> Mon, 5 Mar 2007 16:13:50 +0000
3329
3330openssh (1:4.3p2-8) unstable; urgency=medium
3331
3332 [ Vincent Untz ]
3333 * Give the ssh-askpass-gnome window a default icon; remove unnecessary
3334 icon extension from .desktop file (closes:
3335 https://launchpad.net/bugs/27152).
3336
3337 [ Colin Watson ]
3338 * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't
3339 sufficient to replace conffiles (closes: #402804).
3340 * Make GSSAPICleanupCreds a compatibility alias for
3341 GSSAPICleanupCredentials. Mark GSSUseSessionCCache and
3342 GSSAPIUseSessionCredCache as known-but-unsupported options, and migrate
3343 away from them on upgrade.
3344 * It turns out that the people who told me that removing a conffile in the
3345 preinst was sufficient to have dpkg replace it without prompting when
3346 moving a conffile between packages were very much mistaken. As far as I
3347 can tell, the only way to do this reliably is to write out the desired
3348 new text of the conffile in the preinst. This is gross, and requires
3349 shipping the text of all conffiles in the preinst too, but there's
3350 nothing for it. Fortunately this nonsense is only required for smooth
3351 upgrades from sarge.
3352 * debconf template translations:
3353 - Add Romanian (thanks, Stan Ioan-Eugen; closes: #403528).
3354
3355 -- Colin Watson <cjwatson@debian.org> Sat, 23 Dec 2006 18:38:33 +0000
3356
3357openssh (1:4.3p2-7) unstable; urgency=medium
3358
3359 [ Colin Watson ]
3360 * Ignore errors from usermod when changing sshd's shell, since it will
3361 fail if the sshd user is not local (closes: #398436).
3362 * Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config
3363 to avoid unnecessary conffile resolution steps for administrators
3364 (thanks, Jari Aalto; closes: #335259).
3365 * Fix quoting error in configure.ac and regenerate configure (thanks, Ben
3366 Pfaff; closes: #391248).
3367 * When installing openssh-client or openssh-server from scratch, remove
3368 any unchanged conffiles from the pre-split ssh package to work around a
3369 bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276).
3370
3371 [ Russ Allbery ]
3372 * Create transitional ssh-krb5 package which enables GSSAPI configuration
3373 in sshd_config (closes: #390986).
3374 * Default client to attempting GSSAPI authentication.
3375 * Remove obsolete GSSAPINoMICAuthentication from sshd_config if it's
3376 found.
3377 * Add ssh -K option, the converse of -k, to enable GSSAPI credential
3378 delegation (closes: #401483).
3379
3380 -- Colin Watson <cjwatson@debian.org> Wed, 6 Dec 2006 23:00:49 +0000
3381
3382openssh (1:4.3p2-6) unstable; urgency=low
3383
3384 * Acknowledge NMU (thanks, Manoj; closes: #394795).
3385 * Backport from 4.5p1:
3386 - Fix a bug in the sshd privilege separation monitor that weakened its
3387 verification of successful authentication. This bug is not known to be
3388 exploitable in the absence of additional vulnerabilities.
3389 * openssh-server Suggests: molly-guard (closes: #395473).
3390 * debconf template translations:
3391 - Update German (thanks, Helge Kreutzmann; closes: #395947).
3392
3393 -- Colin Watson <cjwatson@debian.org> Wed, 15 Nov 2006 00:07:32 +0000
3394
3395openssh (1:4.3p2-5.1) unstable; urgency=low
3396
3397 * NMU to update SELinux patch, bringing it in line with current selinux
3398 releases. The patch for this NMU is simply the Bug#394795 patch,
3399 and no other changes. (closes: #394795)
3400
3401 -- Manoj Srivastava <srivasta@debian.org> Mon, 23 Oct 2006 14:11:24 -0500
3402
3403openssh (1:4.3p2-5) unstable; urgency=low
3404
3405 * Remove ssh/insecure_telnetd check altogether (closes: #391081).
3406 * debconf template translations:
3407 - Update Danish (thanks, Claus Hindsgaul; closes: #390612).
3408
3409 -- Colin Watson <cjwatson@debian.org> Thu, 5 Oct 2006 09:04:19 +0100
3410
3411openssh (1:4.3p2-4) unstable; urgency=high
3412
3413 * Backport from 4.4p1 (since I don't have an updated version of the GSSAPI
3414 patch yet):
3415 - CVE-2006-4924: Fix a pre-authentication denial of service found by
3416 Tavis Ormandy, that would cause sshd(8) to spin until the login grace
3417 time expired (closes: #389995).
3418 - CVE-2006-5051: Fix an unsafe signal hander reported by Mark Dowd. The
3419 signal handler was vulnerable to a race condition that could be
3420 exploited to perform a pre-authentication denial of service. On
3421 portable OpenSSH, this vulnerability could theoretically lead to
3422 pre-authentication remote code execution if GSSAPI authentication is
3423 enabled, but the likelihood of successful exploitation appears remote.
3424
3425 * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël
3426 Hertzog; closes: #369395).
3427 * Remove no-longer-used ssh/insecure_rshd debconf template.
3428 * Make ssh/insecure_telnetd Type: error (closes: #388946).
3429
3430 * debconf template translations:
3431 - Update Portuguese (thanks, Rui Branco; closes: #381942).
3432 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
3433 closes: #382966).
3434
3435 -- Colin Watson <cjwatson@debian.org> Fri, 29 Sep 2006 16:28:24 +0100
3436
3437openssh (1:4.3p2-3) unstable; urgency=low
3438
3439 * Document KeepAlive->TCPKeepAlive renaming in sshd_config(5) (closes:
3440 https://launchpad.net/bugs/50702).
3441 * Change sshd user's shell to /usr/sbin/nologin (closes: #366541).
3442 Introduces dependency on passwd for usermod.
3443 * debconf template translations:
3444 - Update French (thanks, Denis Barbier; closes: #368503).
3445 - Update Dutch (thanks, Bart Cornelis; closes: #375100).
3446 - Update Japanese (thanks, Kenshi Muto; closes: #379950).
3447
3448 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jul 2006 00:12:36 +0100
3449
3450openssh (1:4.3p2-2) unstable; urgency=low
3451
3452 * Include commented-out pam_access example in /etc/pam.d/ssh.
3453 * On '/etc/init.d/ssh restart', create /var/run/sshd before checking the
3454 server configuration, as otherwise 'sshd -t' will complain about the
3455 lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234).
3456 * debconf template translations:
3457 - Update Russian (thanks, Yuriy Talakan'; closes: #367143).
3458 - Update Czech (thanks, Miroslav Kure; closes: #367161).
3459 - Update Italian (thanks, Luca Monducci; closes: #367186).
3460 - Update Galician (thanks, Jacobo Tarrio; closes: #367318).
3461 - Update Swedish (thanks, Daniel Nylander; closes: #367971).
3462
3463 -- Colin Watson <cjwatson@debian.org> Fri, 19 May 2006 09:14:27 +0100
3464
3465openssh (1:4.3p2-1) unstable; urgency=low
3466
3467 * New upstream release (closes: #361032).
3468 - CVE-2006-0225: scp (as does rcp, on which it is based) invoked a
3469 subshell to perform local to local, and remote to remote copy
3470 operations. This subshell exposed filenames to shell expansion twice;
3471 allowing a local attacker to create filenames containing shell
3472 metacharacters that, if matched by a wildcard, could lead to execution
3473 of attacker-specified commands with the privilege of the user running
3474 scp (closes: #349645).
3475 - Add support for tunneling arbitrary network packets over a connection
3476 between an OpenSSH client and server via tun(4) virtual network
3477 interfaces. This allows the use of OpenSSH (4.3+) to create a true VPN
3478 between the client and server providing real network connectivity at
3479 layer 2 or 3. This feature is experimental.
3480 - Reduce default key length for new DSA keys generated by ssh-keygen
3481 back to 1024 bits. DSA is not specified for longer lengths and does
3482 not fully benefit from simply making keys longer. As per FIPS 186-2
3483 Change Notice 1, ssh-keygen will refuse to generate a new DSA key
3484 smaller or larger than 1024 bits.
3485 - Fixed X forwarding failing to start when the X11 client is executed in
3486 background at the time of session exit.
3487 - Change ssh-keygen to generate a protocol 2 RSA key when invoked
3488 without arguments (closes: #114894).
3489 - Fix timing variance for valid vs. invalid accounts when attempting
3490 Kerberos authentication.
3491 - Ensure that ssh always returns code 255 on internal error
3492 (closes: #259865).
3493 - Cleanup wtmp files on SIGTERM when not using privsep.
3494 - Set SO_REUSEADDR on X11 listeners to avoid problems caused by
3495 lingering sockets from previous session (X11 applications can
3496 sometimes not connect to 127.0.0.1:60xx) (closes:
3497 https://launchpad.net/bugs/25528).
3498 - Ensure that fds 0, 1 and 2 are always attached in all programs, by
3499 duping /dev/null to them if necessary.
3500 - Xauth list invocation had bogus "." argument.
3501 - Remove internal assumptions on key exchange hash algorithm and output
3502 length, preparing OpenSSH for KEX methods with alternate hashes.
3503 - Ignore junk sent by a server before it sends the "SSH-" banner.
3504 - Many manual page improvements.
3505 - Lots of cleanups, including fixes to memory leaks on error paths and
3506 possible crashes.
3507 * Update to current GSSAPI patch from
3508 http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
3509 (closes: #352042).
3510 * debian/rules: Resynchronise CFLAGS with that generated by configure.
3511 * Restore pam_nologin to /etc/pam.d/ssh; sshd no longer checks this itself
3512 when PAM is enabled, but relies on PAM to do it.
3513 * Rename KeepAlive to TCPKeepAlive in default sshd_config
3514 (closes: #349896).
3515 * Rephrase ssh/new_config and ssh/encrypted_host_key_but_no_keygen debconf
3516 templates to make boolean short descriptions end with a question mark
3517 and to avoid use of the first person.
3518 * Ship README.tun.
3519 * Policy version 3.7.2: no changes required.
3520 * debconf template translations:
3521 - Update Italian (thanks, Luca Monducci; closes: #360348).
3522 - Add Galician (thanks, Jacobo Tarrio; closes: #361220).
3523
3524 -- Colin Watson <cjwatson@debian.org> Fri, 12 May 2006 12:48:24 +0100
3525
3526openssh (1:4.2p1-8) unstable; urgency=low
3527
3528 [ Frans Pop ]
3529 * Use udeb support introduced in debhelper 4.2.0 (available in sarge)
3530 rather than constructing udebs by steam.
3531 * Require debhelper 5.0.22, which generates correct shared library
3532 dependencies for udebs (closes: #360068). This build-dependency can be
3533 ignored if building on sarge.
3534
3535 [ Colin Watson ]
3536 * Switch to debhelper compatibility level 4, since we now require
3537 debhelper 4 even on sarge anyway for udeb support.
3538
3539 -- Colin Watson <cjwatson@debian.org> Fri, 31 Mar 2006 09:44:55 +0100
3540
3541openssh (1:4.2p1-7) unstable; urgency=low
3542
3543 * I accidentally applied the default $PATH change in 1:4.2p1-6 to the udeb
3544 rather than the deb. Fixed.
3545
3546 -- Colin Watson <cjwatson@debian.org> Wed, 1 Mar 2006 16:19:00 +0000
3547
3548openssh (1:4.2p1-6) unstable; urgency=low
3549
3550 * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11
3551 to the normal and superuser paths and /usr/games to the normal path.
3552 * When the client receives a signal, don't fatal() with "Killed by signal
3553 %d." (which produces unhelpful noise on stderr and causes confusion for
3554 users of some applications that wrap ssh); instead, generate a debug
3555 message and exit with the traditional status (closes: #313371).
3556 * debconf template translations:
3557 - Add Swedish (thanks, Daniel Nylander; closes: #333133).
3558 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
3559 closes: #341371).
3560 - Correct erroneously-changed Last-Translator headers in Greek and
3561 Spanish translations.
3562
3563 -- Colin Watson <cjwatson@debian.org> Mon, 20 Feb 2006 16:50:55 +0000
3564
3565openssh (1:4.2p1-5) unstable; urgency=low
3566
3567 * Add a CVE name to the 1:4.0p1-1 changelog entry.
3568 * Build-depend on libselinux1-dev on armeb.
3569 * Only send GSSAPI proposal if GSSAPIAuthentication is enabled.
3570 * Build-depend on libssl-dev (>= 0.9.8-1) to cope with surprise OpenSSL
3571 transition, since otherwise who knows what the buildds will do. If
3572 you're building openssh yourself, you can safely ignore this and use an
3573 older libssl-dev.
3574
3575 -- Colin Watson <cjwatson@debian.org> Fri, 7 Oct 2005 12:23:42 +0100
3576
3577openssh (1:4.2p1-4) unstable; urgency=low
3578
3579 * Initialise token to GSS_C_EMPTY_BUFFER in ssh_gssapi_check_mechanism
3580 (closes: #328606).
3581
3582 -- Colin Watson <cjwatson@debian.org> Fri, 16 Sep 2005 12:50:16 +0100
3583
3584openssh (1:4.2p1-3) unstable; urgency=low
3585
3586 * Add prototype for ssh_gssapi_server_mechanisms (closes: #328372).
3587 * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly
3588 different version of the gssapi authentication method (thanks, Aaron M.
3589 Ucko; closes: #328388).
3590 * Explicitly tell po2debconf to use the 'popular' output encoding, so that
3591 the woody-compatibility hack works even with po-debconf 0.9.0.
3592
3593 -- Colin Watson <cjwatson@debian.org> Thu, 15 Sep 2005 09:28:21 +0100
3594
3595openssh (1:4.2p1-2) unstable; urgency=low
3596
3597 * Annotate 1:4.2p1-1 changelog with CVE references.
3598 * Add remaining pieces of Kerberos support (closes: #152657, #275472):
3599 - Add GSSAPI key exchange support from
3600 http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen
3601 Frost).
3602 - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr.
3603 - openssh-client and openssh-server replace ssh-krb5.
3604 - Update commented-out Kerberos/GSSAPI options in default sshd_config.
3605 - Fix HAVE_GSSAPI_KRB5_H/HAVE_GSSAPI_GSSAPI_KRB5_H typos in
3606 gss-serv-krb5.c.
3607
3608 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 18:28:49 +0100
3609
3610openssh (1:4.2p1-1) unstable; urgency=low
3611
3612 * New upstream release.
3613 - SECURITY (CAN-2005-2797): Fix a bug introduced in OpenSSH 4.0 that
3614 caused GatewayPorts to be incorrectly activated for dynamic ("-D")
3615 port forwardings when no listen address was explicitly specified
3616 (closes: #326065).
3617 - SECURITY (CAN-2005-2798): Fix improper delegation of GSSAPI
3618 credentials. This code is only built in openssh-krb5, not openssh, but
3619 I mention the CVE reference here anyway for completeness.
3620 - Add a new compression method ("Compression delayed") that delays zlib
3621 compression until after authentication, eliminating the risk of zlib
3622 vulnerabilities being exploited by unauthenticated users. Note that
3623 users of OpenSSH versions earlier than 3.5 will need to disable
3624 compression on the client or set "Compression yes" (losing this
3625 security benefit) on the server.
3626 - Increase the default size of new RSA/DSA keys generated by ssh-keygen
3627 from 1024 to 2048 bits (closes: #181162).
3628 - Many bugfixes and improvements to connection multiplexing.
3629 - Don't pretend to accept $HOME (closes: #208648).
3630 * debian/rules: Resynchronise CFLAGS with that generated by configure.
3631 * openssh-client and openssh-server conflict with pre-split ssh to avoid
3632 problems when ssh is left un-upgraded (closes: #324695).
3633 * Set X11Forwarding to yes in the default sshd_config (new installs only).
3634 At least when X11UseLocalhost is turned on, which is the default, the
3635 security risks of using X11 forwarding are risks to the client, not to
3636 the server (closes: #320104).
3637
3638 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 15:16:14 +0100
3639
3640openssh (1:4.1p1-7) unstable; urgency=low
3641
3642 * Do the IDEA host key check on a temporary file to avoid altering
3643 /etc/ssh/ssh_host_key itself (closes: #312312).
3644 * Work around the ssh-askpass alternative somehow ending up in manual mode
3645 pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
3646 * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113).
3647 * Fix XSIish uses of 'test' in openssh-server.preinst.
3648 * Policy version 3.6.2: no changes required.
3649
3650 -- Colin Watson <cjwatson@debian.org> Fri, 2 Sep 2005 16:18:11 +0100
3651
3652openssh (1:4.1p1-6) unstable; urgency=low
3653
3654 * Fix one-character typo that meant the binaries in openssh-client and
3655 openssh-server got recompiled with the wrong options during
3656 'debian/rules install' (closes: #317088, #317238, #317241).
3657
3658 -- Colin Watson <cjwatson@debian.org> Thu, 7 Jul 2005 10:56:16 +0100
3659
3660openssh (1:4.1p1-5) unstable; urgency=low
3661
3662 * Build-depend on libselinux1-dev on ppc64 too (closes: #314625).
3663 * Drop priority of ssh to extra to match the override file.
3664 * Make /usr/share/doc/openssh-server and /usr/share/doc/ssh symlinks to
3665 /usr/share/doc/openssh-client (closes: #314745).
3666 * Ship README.dns (closes: #284874).
3667 * Disable btmp logging, since Debian's /var/log/btmp has inappropriate
3668 permissions (closes: #314956).
3669 * Allow ~/.ssh/config to be group-writable, provided that the group in
3670 question contains only the file's owner (closes: #314347).
3671 * debconf template translations:
3672 - Update Brazilian Portuguese (thanks, André Luís Lopes;
3673 closes: #315477).
3674 - Add Vietnamese (thanks, Clytie Siddall; closes: #316636).
3675
3676 -- Colin Watson <cjwatson@debian.org> Sun, 3 Jul 2005 17:08:08 +0100
3677
3678openssh (1:4.1p1-4) unstable; urgency=low
3679
3680 * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5
3681 only conflicts with ssh (closes: #312475).
3682 * SELinux support (thanks, Manoj Srivastava; closes: #308555):
3683 - Added SELinux capability, and turned it on be default. Added
3684 restorecon calls in preinst and postinst (should not matter if the
3685 machine is not SELinux aware). By and large, the changes made should
3686 have no effect unless the rules file calls --with-selinux; and even
3687 then there should be no performance hit for machines not actively
3688 running SELinux.
3689 - Modified the preinst and postinst to call restorecon to set the
3690 security context for the generated public key files.
3691 - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system
3692 may want to also include pam_selinux.so.
3693 * Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies
3694 are available.
3695 * Restore /usr/lib/sftp-server temporarily, as a symlink to
3696 /usr/lib/openssh/sftp-server (closes: #312891).
3697 * Switch to debhelper compatibility level 3, since 2 is deprecated.
3698 * debconf template translations:
3699 - Update German (thanks, Jens Seidel; closes: #313949).
3700
3701 -- Colin Watson <cjwatson@debian.org> Fri, 17 Jun 2005 14:20:20 +0100
3702
3703openssh (1:4.1p1-3) unstable; urgency=low
3704
3705 * Upload to unstable.
3706
3707 -- Colin Watson <cjwatson@debian.org> Mon, 6 Jun 2005 22:28:33 +0100
3708
3709openssh (1:4.1p1-2) experimental; urgency=low
3710
3711 * Drop debconf support for allowing SSH protocol 1, which is discouraged
3712 and has not been the default since openssh 1:3.0.1p1-1. Users who need
3713 this should edit sshd_config instead (closes: #147212).
3714 * Since ssh-keysign isn't used by default (you need to set
3715 EnableSSHKeysign to "yes" in /etc/ssh/ssh_config), having a debconf
3716 question to ask whether it should be setuid is overkill, and the
3717 question text had got out of date anyway. Remove this question, ship
3718 ssh-keysign setuid in openssh-client.deb, and set a statoverride if the
3719 debconf question was previously set to false.
3720 * Add lintian overrides for the above (setuid-binary,
3721 no-debconf-templates).
3722 * Fix picky lintian errors about slogin symlinks.
3723 * Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling.
3724 * Apply Linux 2.2 workaround (see #239999) only on Linux.
3725
3726 -- Colin Watson <cjwatson@debian.org> Thu, 2 Jun 2005 00:55:58 +0100
3727
3728openssh (1:4.1p1-1) experimental; urgency=low
3729
3730 * New upstream release.
3731 - Normalise socket addresses returned by get_remote_hostname(), fixing
3732 4-in-6 mapping issues with AllowUsers et al (closes: #192234).
3733 * Take upstream's hint and disable the unsupported USE_POSIX_THREADS
3734 (closes: #295757, #308868, and possibly others; may open other bugs).
3735 Use PAM password authentication to avoid #278394. In future I may
3736 provide two sets of binaries built with and without this option, since
3737 it seems I can't win.
3738 * Disable ChallengeResponseAuthentication in new installations, returning
3739 to PasswordAuthentication by default, since it now supports PAM and
3740 apparently works better with a non-threaded sshd (closes: #247521).
3741 * openssh-server Suggests: rssh (closes: #233012).
3742 * Change libexecdir to /usr/lib/openssh, and fix up various alternatives
3743 and configuration files to match (closes: #87900, #151321).
3744 * Fix up very old sshd_config files that refer to /usr/libexec/sftp-server
3745 (closes: #141979).
3746
3747 -- Colin Watson <cjwatson@debian.org> Tue, 31 May 2005 01:33:33 +0100
3748
3749openssh (1:4.0p1-1) experimental; urgency=low
3750
3751 * New upstream release.
3752 - Port-forwarding specifications now take optional bind addresses, and
3753 the server allows client-specified bind addresses for remote port
3754 forwardings when configured with "GatewayPorts clientspecified"
3755 (closes: #87253, #192206).
3756 - ssh and ssh-keyscan now support hashing of known_hosts files for
3757 improved privacy (CAN-2005-2666). ssh-keygen has new options for
3758 managing known_hosts files, which understand hashing.
3759 - sftp supports command history and editing support using libedit
3760 (closes: #287013).
3761 - Have scp and sftp wait for the spawned ssh to exit before they exit
3762 themselves, allowing ssh to restore terminal modes (closes: #257130).
3763 - Improved the handling of bad data in authorized_keys files,
3764 eliminating fatal errors on corrupt or very large keys; e.g. linefeeds
3765 in keys only produce errors in auth.log now (closes: #220726).
3766 - Add "command mode" to ssh connection multiplexing (closes: #303452).
3767 - Mention $HOME/.hushlogin in sshd(8) FILES section (closes: #163933).
3768 * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU;
3769 closes: #296487).
3770 * Remove obsolete and unnecessary ssh/forward_warning debconf note.
3771 * Hurd build fixes (although sshd still doesn't work):
3772 - Restore X forwarding fix from #102991, lost somewhere along the way.
3773 - Link with -lcrypt.
3774 - Link with -lpthread rather than -pthread.
3775 - Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to
3776 satisfy build-dependencies.
3777 * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
3778 * Enable HashKnownHosts by default. This only affects new entries; use
3779 'ssh-keygen -H' to convert an entire known_hosts file to hashed format.
3780 * Note in ssh_config(5) that the SetupTimeOut option is Debian-specific
3781 (closes: #307069).
3782 * debconf template translations:
3783 - Update Czech (thanks, Miroslav Kure; closes: #298744).
3784 - Update Finnish (thanks, Matti Pöllä; closes: #303787).
3785 - Synchronise Spanish with sarge branch (thanks, Javier
3786 Fernández-Sanguino Peña; closes: #298536).
3787 - Add Ukrainian (thanks, Eugeniy Meshcheryakov; closes: #301852).
3788
3789 -- Colin Watson <cjwatson@debian.org> Thu, 26 May 2005 11:23:18 +0100
3790
3791openssh (1:3.9p1-3) experimental; urgency=low
3792
3793 * Explain how to run sshd from inittab in README.Debian (closes: #147360).
3794 * Add debian/watch file.
3795
3796 -- Colin Watson <cjwatson@debian.org> Fri, 18 Feb 2005 00:20:16 +0000
3797
3798openssh (1:3.9p1-2) experimental; urgency=low
3799
3800 * Remove pam_nologin from /etc/pam.d/ssh, as sshd's built-in support
3801 appears to be sufficient and more useful (closes: #162996).
3802 * Depend on debconf | debconf-2.0.
3803 * Drop LoginGraceTime back to the upstream default of two minutes on new
3804 installs (closes: #289573).
3805 * debconf template translations from Ubuntu bug #1232:
3806 - Update Greek (thanks, Logiotatidis George).
3807 - Update Spanish (thanks, Santiago Erquicia).
3808
3809 -- Colin Watson <cjwatson@debian.org> Sat, 15 Jan 2005 12:37:54 +0000
3810
3811openssh (1:3.9p1-1) experimental; urgency=low
3812
3813 * New upstream release.
3814 - PAM password authentication implemented again (closes: #238699,
3815 #242119).
3816 - Implemented the ability to pass selected environment variables between
3817 the client and the server.
3818 - Fix ssh-keyscan breakage when remote server doesn't speak SSH protocol
3819 (closes: #228828).
3820 - Fix res_query detection (closes: #242462).
3821 - 'ssh -c' documentation improved (closes: #265627).
3822 * Pass LANG and LC_* environment variables from the client by default, and
3823 accept them to the server by default in new installs, although not on
3824 upgrade (closes: #264024).
3825 * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones).
3826 * Expand on openssh-client package description (closes: #273831).
3827
3828 -- Colin Watson <cjwatson@debian.org> Tue, 4 Jan 2005 14:18:31 +0000
3829
3830openssh (1:3.8.1p1-14) experimental; urgency=low
3831
3832 * We use DH_COMPAT=2, so build-depend on debhelper (>= 2).
3833 * Fix timing information leak allowing discovery of invalid usernames in
3834 PAM keyboard-interactive authentication (backported from a patch by
3835 Darren Tucker; closes: #281595).
3836 * Make sure that there's a delay in PAM keyboard-interactive
3837 authentication when PermitRootLogin is not set to yes and the correct
3838 root password is entered (closes: #248747).
3839
3840 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 18:09:37 +0000
3841
3842openssh (1:3.8.1p1-13) experimental; urgency=low
3843
3844 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
3845 * debconf template translations:
3846 - Update Dutch (thanks, cobaco; closes: #278715).
3847 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
3848
3849 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 12:03:13 +0000
3850
3851openssh (1:3.8.1p1-12) experimental; urgency=low
3852
3853 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
3854 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
3855 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
3856 implementations apparently have problems with the long version string.
3857 This is of course a bug in those implementations, but since the extent
3858 of the problem is unknown it's best to play safe (closes: #275731).
3859 * debconf template translations:
3860 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
3861 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
3862 - Update French (thanks, Denis Barbier; closes: #276703).
3863 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
3864
3865 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 19:21:17 +0100
3866
3867openssh (1:3.8.1p1-11) experimental; urgency=high
3868
3869 * Move sshd_config(5) to openssh-server, where it belongs.
3870 * If PasswordAuthentication is disabled, then offer to disable
3871 ChallengeResponseAuthentication too. The current PAM code will attempt
3872 password-style authentication if ChallengeResponseAuthentication is
3873 enabled (closes: #250369).
3874 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
3875 later and then upgraded. Sorry about that ... for this reason, the
3876 default answer is to leave ChallengeResponseAuthentication enabled.
3877
3878 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:28:20 +0100
3879
3880openssh (1:3.8.1p1-10) experimental; urgency=low
3881
3882 * Don't install the ssh-askpass-gnome .desktop file by default; I've had
3883 too many GNOME people tell me it's the wrong thing to be doing. I've
3884 left it in /usr/share/doc/ssh-askpass-gnome/examples/ for now.
3885
3886 -- Colin Watson <cjwatson@debian.org> Wed, 25 Aug 2004 18:18:14 +0100
3887
3888openssh (1:3.8.1p1-9) experimental; urgency=low
3889
3890 * Split the ssh binary package into openssh-client and openssh-server
3891 (closes: #39741). openssh-server depends on openssh-client for some
3892 common functionality; it didn't seem worth creating yet another package
3893 for this. openssh-client is priority standard, openssh-server optional.
3894 * New transitional ssh package, priority optional, depending on
3895 openssh-client and openssh-server. May be removed once nothing depends
3896 on it.
3897 * When upgrading from ssh to openssh-{client,server}, it's very difficult
3898 for the maintainer scripts to find out what version we're upgrading from
3899 without dodgy dpkg hackery. I've therefore taken the opportunity to move
3900 a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
3901 and ssh/user_environment_tell.
3902 * Add a heuristic to try to make sure the sshd_config upgrade to >= 3.7
3903 happens even though we don't know what version we're upgrading from.
3904 * Remove /etc/ssh/sshd_not_to_be_run on purge of openssh-server. For now
3905 (until sarge+2) it's still honoured to avoid breaking existing
3906 configurations, but the right approach is now to remove the
3907 openssh-server package if you don't want to run the server. Add a NEWS
3908 item to that effect.
3909
3910 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
3911
3912openssh (1:3.8.1p1-8.sarge.4) unstable; urgency=high
3913
3914 * Fix timing information leak allowing discovery of invalid usernames in
3915 PAM keyboard-interactive authentication (backported from a patch by
3916 Darren Tucker; closes: #281595).
3917 * Make sure that there's a delay in PAM keyboard-interactive
3918 authentication when PermitRootLogin is not set to yes and the correct
3919 root password is entered (closes: #248747).
3920
3921 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 12:37:16 +0000
3922
3923openssh (1:3.8.1p1-8.sarge.3) unstable; urgency=low
3924
3925 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
3926 * debconf template translations:
3927 - Update Dutch (thanks, cobaco; closes: #278715).
3928 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
3929
3930 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 10:31:12 +0000
3931
3932openssh (1:3.8.1p1-8.sarge.2) unstable; urgency=low
3933
3934 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
3935 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
3936 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
3937 implementations apparently have problems with the long version string.
3938 This is of course a bug in those implementations, but since the extent
3939 of the problem is unknown it's best to play safe (closes: #275731).
3940 * debconf template translations:
3941 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
3942 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
3943 - Update French (thanks, Denis Barbier; closes: #276703).
3944 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
3945
3946 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 17:57:14 +0100
3947
3948openssh (1:3.8.1p1-8.sarge.1) unstable; urgency=high
3949
3950 * If PasswordAuthentication is disabled, then offer to disable
3951 ChallengeResponseAuthentication too. The current PAM code will attempt
3952 password-style authentication if ChallengeResponseAuthentication is
3953 enabled (closes: #250369).
3954 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
3955 later and then upgraded. Sorry about that ... for this reason, the
3956 default answer is to leave ChallengeResponseAuthentication enabled.
3957
3958 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:21:55 +0100
3959
3960openssh (1:3.8.1p1-8) unstable; urgency=high
3961
3962 * Matthew Vernon:
3963 - Add a GPL exception to the licensing terms of the Debian patch
3964 (closes: #211644).
3965
3966 -- Colin Watson <cjwatson@debian.org> Thu, 29 Jul 2004 13:28:47 +0100
3967
3968openssh (1:3.8.1p1-7) unstable; urgency=low
3969
3970 * Re-enable shadow password support in openssh-server-udeb, at Bastian
3971 Blank's request (closes: #260800).
3972
3973 -- Colin Watson <cjwatson@debian.org> Thu, 22 Jul 2004 10:56:06 +0100
3974
3975openssh (1:3.8.1p1-6) unstable; urgency=low
3976
3977 * Implement hack in
3978 http://lists.debian.org/debian-boot/2004/07/msg01207.html to get
3979 openssh-client-udeb to show up as a retrievable debian-installer
3980 component.
3981 * Generate host keys in postinst only if the relevant HostKey directives
3982 are found in sshd_config (closes: #87946).
3983
3984 -- Colin Watson <cjwatson@debian.org> Wed, 21 Jul 2004 15:14:46 +0100
3985
3986openssh (1:3.8.1p1-5) unstable; urgency=medium
3987
3988 * Update German debconf template translation (thanks, Helge Kreutzmann;
3989 closes: #252226).
3990 * Remove Suggests: dnsutils, as it was only needed for
3991 make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan.
3992 * Disable shadow password support in openssh-server-udeb.
3993 * Fix non-portable shell constructs in maintainer scripts, Makefile, and
3994 ssh-copy-id (thanks, David Weinehall; closes: #258517).
3995 * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD
3996 handler kill the PAM thread if its waitpid() call returns 0, as well as
3997 the previous check for -1 (closes: #252676).
3998 * Add scp and sftp to openssh-client-udeb. It might not be very 'u' any
3999 more; oh well.
4000
4001 -- Colin Watson <cjwatson@debian.org> Sat, 10 Jul 2004 13:57:27 +0100
4002
4003openssh (1:3.8.1p1-4) unstable; urgency=medium
4004
4005 * Kill off PAM thread if privsep slave dies (closes: #248125).
4006
4007 -- Colin Watson <cjwatson@debian.org> Fri, 28 May 2004 17:58:45 -0300
4008
4009openssh (1:3.8.1p1-3) unstable; urgency=low
4010
4011 * Add ssh-keygen to openssh-server-udeb.
4012
4013 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 16:31:52 +0100
4014
4015openssh (1:3.8.1p1-2) unstable; urgency=low
4016
4017 * Add Catalan debconf template translation (thanks, Aleix Badia i Bosch;
4018 closes: #248748).
4019 * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb
4020 (not yet uploaded).
4021 * Restore ssh-askpass-gnome binary, lost by mistake.
4022 * Don't link against libnsl in udeb builds.
4023
4024 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 11:15:58 +0100
4025
4026openssh (1:3.8.1p1-1) unstable; urgency=low
4027
4028 * New upstream release.
4029 - Use a longer buffer for tty names in utmp (closes: #247538).
4030 * Make sure there's a newline at the end of sshd_config before adding
4031 'UsePAM yes' (closes: #244829).
4032 * Generate a new .orig.tar.gz without RFC.nroff, and remove
4033 /usr/share/doc/ssh/RFC.gz (closes: #211640). It isn't DFSG-free and only
4034 documents the obsolete SSH1 protocol, not to mention that it was never a
4035 real RFC but only an Internet-Draft. It's available from
4036 http://www.free.lp.se/bamse/draft-ylonen-ssh-protocol-00.txt if you want
4037 it for some reason.
4038 * Add openssh-client-udeb and openssh-server-udeb binary packages for use
4039 in debian-installer. They still need libnss_files to be supplied in udeb
4040 form by glibc.
4041 * Work around lack of res_query weak alias in libresolv on amd64 (see
4042 #242462, awaiting real fix upstream).
4043 * Fix grammar in sshd(8) (closes: #238753).
4044 * Add .desktop file and icon for ssh-askpass-gnome (closes: #232333).
4045 * Update Polish debconf template translation (thanks, Emil Nowak;
4046 closes: #242808).
4047 * Add Turkish debconf template translation (thanks, Recai Oktaş;
4048 closes: #246068).
4049
4050 -- Colin Watson <cjwatson@debian.org> Tue, 11 May 2004 23:38:10 +0100
4051
4052openssh (1:3.8p1-3) unstable; urgency=low
4053
4054 * Remove deprecated ReverseMappingCheck option from newly generated
4055 sshd_config files (closes: #239987).
4056 * Build everything apart from contrib in a subdirectory, to allow for
4057 multiple builds.
4058 * Some older kernels are missing setresuid() and setresgid(), so don't try
4059 to use them. setreuid() and setregid() will do well enough for our
4060 purposes (closes: #239999).
4061
4062 -- Colin Watson <cjwatson@debian.org> Mon, 5 Apr 2004 21:23:43 +0100
4063
4064openssh (1:3.8p1-2) unstable; urgency=medium
4065
4066 * Disable PasswordAuthentication for new installations (closes: #236810).
4067 * Turn off the new ForwardX11Trusted by default, returning to the
4068 semantics of 3.7 and earlier, since it seems immature and causes far too
4069 many problems with existing setups. See README.Debian for details
4070 (closes: #237021).
4071
4072 -- Colin Watson <cjwatson@debian.org> Wed, 10 Mar 2004 10:33:07 +0000
4073
4074openssh (1:3.8p1-1) unstable; urgency=low
4075
4076 * New upstream release (closes: #232281):
4077 - New PAM implementation based on that in FreeBSD. This runs PAM session
4078 modules before dropping privileges (closes: #132681, #150968).
4079 - Since PAM session modules are run as root, we can turn pam_limits back
4080 on by default, and it no longer spits out "Operation not permitted" to
4081 syslog (closes: #171673).
4082 - Password expiry works again (closes: #153235).
4083 - 'ssh -q' suppresses login banner (closes: #134589).
4084 - sshd doesn't lie to PAM about invalid usernames (closes: #157078).
4085 - ssh-add prints key comment on each prompt (closes: #181869).
4086 - Punctuation formatting fixed in man pages (closes: #191131).
4087 - EnableSSHKeysign documented in ssh_config(5) (closes: #224457).
4088 * Add 'UsePAM yes' to /etc/ssh/sshd_config on upgrade from versions older
4089 than this, to maintain the standard Debian sshd configuration.
4090 * Comment out PAMAuthenticationViaKbdInt and RhostsAuthentication in
4091 sshd_config on upgrade. Neither option is supported any more.
4092 * Privilege separation and PAM are now properly supported together, so
4093 remove both debconf questions related to them and simply set it
4094 unconditionally in newly generated sshd_config files (closes: #228838).
4095 * ServerAliveInterval implemented upstream, so ProtocolKeepAlives is now a
4096 compatibility alias. The semantics differ slightly, though; see
4097 ssh_config(5) for details.
4098 * Implement SSH1 support for ServerAliveInterval using SSH_MSG_IGNORE. As
4099 documented in ssh_config(5), it's not as good as the SSH2 version.
4100 * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and
4101 -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary.
4102 * Update config.guess and config.sub from autotools-dev 20040105.1.
4103 * Darren Tucker:
4104 - Reset signal status when starting pam auth thread, prevent hanging
4105 during PAM keyboard-interactive authentications.
4106 - Fix a non-security-critical segfault in PAM authentication.
4107 * Add debconf template translations:
4108 - Greek (thanks, Konstantinos Margaritis; closes: #232843).
4109 - Italian (thanks, Renato Gini; closes: #234777).
4110
4111 -- Colin Watson <cjwatson@debian.org> Sat, 6 Mar 2004 18:43:44 +0000
4112
4113openssh (1:3.6.1p2-12) unstable; urgency=low
4114
4115 * Update Spanish debconf template translation (thanks, Javier
4116 Fernández-Sanguino Peña; closes: #228242).
4117 * Add debconf template translations:
4118 - Czech (thanks, Miroslav Kure; closes: #230110).
4119 - Simplified Chinese (thanks, Hiei Xu; closes: #230726).
4120
4121 -- Colin Watson <cjwatson@debian.org> Wed, 11 Feb 2004 09:37:57 +0000
4122
4123openssh (1:3.6.1p2-11) unstable; urgency=low
4124
4125 * Comment out pam_limits in default configuration, for now at least
4126 (closes: #198254).
4127 * Use invoke-rc.d (if it exists) to run the init script.
4128 * Backport format string bug fix in sshconnect.c (closes: #225238).
4129 * ssh-copy-id exits if ssh fails (closes: #215252).
4130
4131 -- Colin Watson <cjwatson@debian.org> Sun, 4 Jan 2004 18:59:21 +0000
4132
4133openssh (1:3.6.1p2-10) unstable; urgency=low
4134
4135 * Use --retry in init script when restarting rather than sleeping, to make
4136 sure the old process is dead (thanks, Herbert Xu; closes: #212117).
4137 Depend on dpkg (>= 1.9.0) for start-stop-daemon's --retry option.
4138 * Update debconf template translations:
4139 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #219844).
4140 - Danish (thanks, Morten Brix Pedersen; closes: #217964).
4141 - Japanese (thanks, Kenshi Muto; closes: #212497).
4142 - Russian (thanks, Ilgiz Kalmetev).
4143 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #211832).
4144 * Add Dutch debconf template translation (thanks, cobaco;
4145 closes: #215372).
4146 * Update config.guess and config.sub from autotools-dev 20031007.1
4147 (closes: #217696).
4148 * Implement New World Order for PAM configuration, including
4149 /etc/pam.d/common-* from /etc/pam.d/ssh (closes: #212959).
4150 - To backport this release to woody, you need to set DEB_BUILD_SSH_WOODY
4151 in your environment. See README.Debian.
4152 * Add more commentary to /etc/pam.d/ssh.
4153
4154 -- Colin Watson <cjwatson@debian.org> Sun, 16 Nov 2003 01:14:16 +0000
4155
4156openssh (1:3.6.1p2-9) unstable; urgency=high
4157
4158 * Merge even more buffer allocation fixes from upstream (CAN-2003-0682;
4159 closes: #211434).
4160
4161 -- Colin Watson <cjwatson@debian.org> Fri, 19 Sep 2003 10:25:25 +0100
4162
4163openssh (1:3.6.1p2-8) unstable; urgency=high
4164
4165 * Merge more buffer allocation fixes from new upstream version 3.7.1p1
4166 (closes: #211324).
4167
4168 -- Colin Watson <cjwatson@debian.org> Wed, 17 Sep 2003 03:07:19 +0100
4169
4170openssh (1:3.6.1p2-7) unstable; urgency=high
4171
4172 * Update debconf template translations:
4173 - French (thanks, Christian Perrier; closes: #208801).
4174 - Japanese (thanks, Kenshi Muto; closes: #210380).
4175 * Some small improvements to the English templates courtesy of Christian
4176 Perrier. I've manually unfuzzied a few translations where it was
4177 obvious, on Christian's advice, but the others will have to be updated.
4178 * Document how to generate an RSA1 host key (closes: #141703).
4179 * Incorporate NMU fix for early buffer expansion vulnerability,
4180 CAN-2003-0693 (closes: #211205). Thanks to Michael Stone.
4181
4182 -- Colin Watson <cjwatson@debian.org> Tue, 16 Sep 2003 14:32:28 +0100
4183
4184openssh (1:3.6.1p2-6.0) unstable; urgency=high
4185
4186 * SECURITY: fix for CAN-2003-0693, buffer allocation error
4187
4188 -- Michael Stone <mstone@debian.org> Tue, 16 Sep 2003 08:27:07 -0400
4189
4190openssh (1:3.6.1p2-6) unstable; urgency=medium
4191
4192 * Use a more CVS-friendly means of setting SSH_VERSION.
4193 * Update Brazilian Portuguese debconf template translation (thanks, Andre
4194 Luis Lopes; closes: #208036).
4195 * Don't run 'sshd -t' in init script if the server isn't to be run
4196 (closes: #197576).
4197 * Fix login delay, spurious auth.log entry, and PermitRootLogin
4198 information leakage due to PAM issues with upstream's recent security
4199 update (thanks, Darren Tucker; closes: #99168, #192207, #193546).
4200 * Policy version 3.6.1: recode this changelog to UTF-8.
4201
4202 -- Colin Watson <cjwatson@debian.org> Wed, 3 Sep 2003 19:14:02 +0100
4203
4204openssh (1:3.6.1p2-5) unstable; urgency=low
4205
4206 * Disable cmsg_type check for file descriptor passing when running on
4207 Linux 2.0 (closes: #150976). Remove comments about non-functional
4208 privilege separation on 2.0 from ssh/privsep_ask and ssh/privsep_tell
4209 debconf questions and from README.Debian, since it should all now work.
4210 * Fix "defails" typo in generated sshd_config (closes: #206484).
4211 * Backport upstream patch to strip trailing whitespace (including
4212 newlines) from configuration directives (closes: #192079).
4213
4214 -- Colin Watson <cjwatson@debian.org> Wed, 27 Aug 2003 02:19:57 +0100
4215
4216openssh (1:3.6.1p2-4) unstable; urgency=low
4217
4218 * getent can get just one key; no need to use grep (thanks, James Troup).
4219 * Move /usr/local/bin to the front of the default path, following
4220 /etc/login.defs (closes: #201150).
4221 * Remove specifics of problematic countries from package description
4222 (closes: #197040).
4223 * Update Spanish debconf template translation (thanks, Carlos Valdivia
4224 Yagüe; closes: #198456).
4225 * Backport upstream patch to pass monitor signals through to child
4226 (closes: #164797).
4227
4228 -- Colin Watson <cjwatson@debian.org> Sun, 27 Jul 2003 17:31:15 +0100
4229
4230openssh (1:3.6.1p2-3) unstable; urgency=low
4231
4232 * Update French debconf template translation (thanks, Christian Perrier;
4233 closes: #194323).
4234 * Version the adduser dependency for --no-create-home (closes: #195756).
4235 * Add a version of moduli(5), namely revision 1.7 of
4236 http://www.openbsd.org/cgi-bin/cvsweb/src/share/man/man5/moduli.5 with
4237 '/etc/moduli' changed to '/etc/ssh/moduli' throughout (closes: #196061).
4238
4239 -- Colin Watson <cjwatson@debian.org> Mon, 9 Jun 2003 02:51:35 +0100
4240
4241openssh (1:3.6.1p2-2) unstable; urgency=low
4242
4243 * Force /etc/default/ssh to be non-executable, since dpkg apparently
4244 doesn't deal with permissions changes on conffiles (closes: #192966).
4245 * Use debconf 0.5's seen flag rather than the deprecated isdefault.
4246 * Add GPL location to copyright file.
4247 * Remove debian/postinst.old.
4248 * Switch to po-debconf, with some careful manual use of po2debconf to
4249 ensure that the source package continues to build smoothly on woody
4250 (closes: #183986).
4251 * Update debconf template translations:
4252 - Brazilian Portugese (thanks, Andre Luis Lopes; see #183986).
4253 - Japanese (thanks, Tomohiro KUBOTA; closes: #192429).
4254 * Compile with -fno-builtin-log for now, otherwise gcc-3.3 complains
4255 "log.h:59: warning: conflicting types for built-in function `log'". The
4256 OpenSSH log() function has been renamed in upstream CVS.
4257
4258 -- Colin Watson <cjwatson@debian.org> Mon, 19 May 2003 01:52:38 +0100
4259
4260openssh (1:3.6.1p2-1) unstable; urgency=medium
4261
4262 * New upstream release, including fix for PAM user-discovery security hole
4263 (closes: #191681).
4264 * Fix ChallengeResponseAuthentication default in generated sshd_config
4265 (closes: #106037).
4266 * Put newlines after full stops in man page documentation for
4267 ProtocolKeepAlives and SetupTimeOut.
4268 * Policy version 3.5.9: support DEB_BUILD_OPTIONS=noopt, build
4269 gnome-ssh-askpass with -g and -Wall flags.
4270 * Really ask ssh/new_config debconf question before trying to fetch its
4271 value (closes: #188721).
4272 * On purge, remove only the files we know about in /etc/ssh rather than
4273 the whole thing, and remove the directory if that leaves it empty
4274 (closes: #176679).
4275 * ssh has depended on debconf for some time now with no complaints, so:
4276 - Simplify the postinst by relying on debconf being present. (The absent
4277 case was buggy anyway.)
4278 - Get rid of "if you have not installed debconf" text in README.Debian,
4279 and generally update the "/usr/bin/ssh not SUID" entry.
4280 * More README.Debian work:
4281 - Reorganize into "UPGRADE ISSUES" and "OTHER ISSUES", in an effort to
4282 make it easier for people to find the former. The upgrade issues
4283 should probably be sorted by version somehow.
4284 - Document X11UseLocalhost under "X11 Forwarding" (closes: #150913).
4285 * Fix setting of IP flags for interactive sessions (upstream bug #541).
4286
4287 -- Colin Watson <cjwatson@debian.org> Mon, 5 May 2003 17:47:40 +0100
4288
4289openssh (1:3.6.1p1-1) unstable; urgency=low
4290
4291 * New upstream release (thanks, Laurence J. Lane).
4292 * debian/control: ssh-askpass-gnome is now Section: gnome, following the
4293 override file.
4294
4295 -- Colin Watson <cjwatson@debian.org> Wed, 2 Apr 2003 00:51:02 +0100
4296
4297openssh (1:3.6p1-1) unstable; urgency=low
4298
4299 * New upstream release.
4300 - Workaround applied upstream for a bug in the interaction of glibc's
4301 getaddrinfo() with the Linux 2.2 kernel (closes: #155814).
4302 - As such, it should now be safe to remove --with-ipv4-default, so
4303 starting sshd with -6 is no longer necessary (closes: #79861 and lots
4304 of other merged bugs).
4305 - ssh-copy-id prints usage when run without arguments (closes: #71376).
4306 - scp exits 1 if ssh fails (closes: #138400).
4307 - sshd writes to utmp's ut_addr_v6 field in IPv6 mode (closes: #167867).
4308 - 'ssh-add -c' causes ssh-agent to ask the user each time a key is used
4309 (closes: #109795).
4310 * Install /etc/default/ssh non-executable (closes: #185537).
4311
4312 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2003 23:00:59 +0100
4313
4314openssh (1:3.5p1-5) unstable; urgency=low
4315
4316 * Add /etc/default/ssh (closes: #161049).
4317 * Run the init script under 'set -e' (closes: #175010).
4318 * Change the default superuser path to include /sbin, /usr/sbin, and
4319 /usr/local/sbin (closes: #128235, #151267). Using login.defs would be
4320 nice, but that belongs to another package. Without a defined API to
4321 retrieve its settings, parsing it is off-limits.
4322 * Build ssh-askpass-gnome with GNOME 2. The source package should still
4323 support building on stable with GNOME 1, using the alternate
4324 libgnome-dev build-dependency (thanks, Colin Walters; closes: #167582).
4325
4326 -- Colin Watson <cjwatson@debian.org> Sun, 9 Mar 2003 20:12:10 +0000
4327
4328openssh (1:3.5p1-4) unstable; urgency=low
4329
4330 * Point rlogin and rcp alternatives at slogin and scp respectively rather
4331 than ssh (closes: #121103, #151666). Fix alternative removal to match;
4332 previously it was completely wrong anyway.
4333 * Find out whether /etc/ssh/sshd_not_to_be_run exists and set the debconf
4334 question's default using that information, rather than using debconf as
4335 a registry. Other solutions may be better in the long run, but this is
4336 at least correct (thanks, Matthew Woodcraft; closes: #84725).
4337 * Stop using pam_lastlog, as it doesn't currently work well as a session
4338 module when privilege separation is enabled; it can usually read
4339 /var/log/lastlog but can't write to it. Instead, just use sshd's
4340 built-in support, already enabled by default (closes: #151297, #169938).
4341 * Use 'ssh-keygen -q' rather than redirecting output to /dev/null.
4342 * Add a "this may take some time" warning when creating host keys on
4343 installation (part of #110094).
4344 * When restarting via the init script, check for sshd_not_to_be_run after
4345 stopping sshd (idea from Tomas Pospisek; closes: #149850).
4346 * Append /usr/sbin:/sbin to the init script's $PATH, just in case of
4347 strangeness (closes: #115138).
4348 * Fix a dpkg-statoverride call to redirect stdout to /dev/null, not
4349 stderr.
4350 * Correct copyright file typo: "orignal" -> "original" (closes: #176490).
4351 * Rebuild with libssl0.9.7 (closes: #176983).
4352 * We're up to policy version 3.5.6. DEB_BUILD_OPTIONS stuff still needs to
4353 be looked at.
4354
4355 -- Colin Watson <cjwatson@debian.org> Sat, 18 Jan 2003 01:37:23 +0000
4356
4357openssh (1:3.5p1-3) unstable; urgency=low
4358
4359 * Happy new year!
4360 * Use getent rather than id to find out whether the sshd user exists
4361 (closes: #150974).
4362 * Remove some duplication from the postinst's ssh-keysign setuid code.
4363 * Replace db_text with db_input throughout debian/config. (db_text has
4364 been a compatibility wrapper since debconf 0.1.5.)
4365 * Warn about PermitUserEnvironment on upgrade (closes: #167895).
4366 * Use 'make install-nokeys', and disable unused debhelper commands,
4367 thereby forward-porting the last pieces of Zack Weinberg's patch
4368 (closes: #68341).
4369 * Move the man page for gnome-ssh-askpass from the ssh package to
4370 ssh-askpass-gnome (closes: #174449).
4371 * Build with -DLOGIN_NO_ENDOPT, since Debian's /bin/login doesn't accept
4372 '--' to terminate the list of options (closes: #171554).
4373 * Add Jonathan Amery's ssh-argv0 script (closes: #111341).
4374 * Update Danish debconf template (thanks, Morten Brix Pedersen;
4375 closes: #174757).
4376 * Document setgid ssh-agent's effect on certain environment variables in
4377 README.Debian (closes: #167974).
4378 * Document interoperability problems between scp and ssh.com's server in
4379 README.Debian, and suggest some workarounds (closes: #174662).
4380
4381 -- Colin Watson <cjwatson@debian.org> Wed, 1 Jan 2003 14:18:30 +0000
4382
4383openssh (1:3.5p1-2) unstable; urgency=low
4384
4385 * Mention in the ssh package description that it provides both ssh and
4386 sshd (closes: #99680).
4387 * Create a system group for ssh-agent, not a user group (closes: #167669).
4388
4389 -- Colin Watson <cjwatson@debian.org> Mon, 4 Nov 2002 13:43:53 +0000
4390
4391openssh (1:3.5p1-1) unstable; urgency=low
4392
4393 * New upstream release.
4394 - Fixes typo in ssh-add usage (closes: #152239).
4395 - Fixes 'PermitRootLogin forced-commands-only' (closes: #166184).
4396 - ~/.ssh/environment and environment= options in ~/.ssh/authorized_keys
4397 are deprecated for security reasons and will eventually go away. For
4398 now they can be re-enabled by setting 'PermitUserEnvironment yes' in
4399 sshd_config.
4400 - ssh-agent is installed setgid to prevent ptrace() attacks. The group
4401 actually doesn't matter, as it drops privileges immediately, but to
4402 avoid confusion the postinst creates a new 'ssh' group for it.
4403 * Obsolete patches:
4404 - Solar Designer's privsep+compression patch for Linux 2.2 (see
4405 1:3.3p1-0.0woody1).
4406 - Hostbased auth ssh-keysign backport (see 1:3.4p1-4).
4407
4408 * Remove duplicated phrase in ssh_config(5) (closes: #152404).
4409 * Source the debconf confmodule at the top of the postrm rather than at
4410 the bottom, to avoid making future non-idempotency problems worse (see
4411 #151035).
4412 * Debconf templates:
4413 - Add Polish (thanks, Grzegorz Kusnierz).
4414 - Update French (thanks, Denis Barbier; closes: #132509).
4415 - Update Spanish (thanks, Carlos Valdivia Yagüe; closes: #164716).
4416 * Write a man page for gnome-ssh-askpass, and link it to ssh-askpass.1 if
4417 this is the selected ssh-askpass alternative (closes: #67775).
4418
4419 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
4420
4421openssh (1:3.4p1-4) unstable; urgency=low
4422
4423 * Allow ssh-krb5 in ssh-askpass-gnome's dependencies (closes: #129532).
4424 * Restore Russia to list of countries where encryption is problematic (see
4425 #148951 and http://www.average.org/freecrypto/).
4426 * Drop ssh-askpass-gnome's priority to optional, per the override file.
4427 * Drop the PAM special case for hurd-i386 (closes: #99157).
4428 * s/dile/idle/ in ssh_config(5) (closes: #118331).
4429 * Note in README.Debian that you need xauth from xbase-clients on the
4430 server for X11 forwarding (closes: #140269).
4431 * Use correct path to upstream README in copyright file (closes: #146037).
4432 * Document the units for ProtocolKeepAlives (closes: #159479).
4433 * Backport upstream patch to fix hostbased auth (closes: #117114).
4434 * Add -g to CFLAGS.
4435
4436 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 18:58:53 +0100
4437
4438openssh (1:3.4p1-3) unstable; urgency=low
4439
4440 * Add myself to Uploaders: and begin acting as temporary maintainer, at
4441 Matthew's request. (Normal service will resume in some months' time.)
4442 * Add sharutils to Build-Depends (closes: #138465).
4443 * Stop creating the /usr/doc/ssh symlink.
4444
4445 * Fix some debconf template typos (closes: #160358).
4446 * Split debconf templates into one file per language.
4447 * Add debconf template translations:
4448 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #106173).
4449 - Danish (thanks, Claus Hindsgaul; closes: #126607).
4450 - Japanese (thanks, Tomohiro KUBOTA; closes: #137427).
4451 - Russian (thanks, Ilgiz Kalmetev; closes: #136610).
4452 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #129041).
4453 * Update debconf template translations:
4454 - French (thanks, Igor Genibel; closes: #151361).
4455 - German (thanks, Axel Noetzold; closes: #147069).
4456 * Some of these translations are fuzzy. Please send updates.
4457
4458 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 14:09:57 +0100
4459
4460openssh (1:3.4p1-2) unstable; urgency=high
4461
4462 * Get a security-fixed version into unstable
4463 * Also tidy README.Debian up a little
4464
4465 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 17:20:59 +0100
4466
4467openssh (1:3.4p1-1) testing; urgency=high
4468
4469 * Extend my tendrils back into this package (Closes: #150915, #151098)
4470 * thanks to the security team for their work
4471 * no thanks to ISS/Theo de Raadt for their handling of these bugs
4472 * save old sshd_configs to sshd_config.dpkg-old when auto-generating a
4473 new one
4474 * tell/ask the user about PriviledgeSeparation
4475 * /etc/init.d/ssh run will now create the chroot empty dir if necessary
4476 * Remove our previous statoverride on /usr/bin/ssh (only for people
4477 upgrading from a version where we'd put one in ourselves!)
4478 * Stop slandering Russia, since someone asked so nicely (Closes: #148951)
4479 * Reduce the sleep time in /etc/init.d/ssh during a restart
4480
4481 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 15:52:10 +0100
4482
4483openssh (1:3.4p1-0.0woody1) testing-security; urgency=high
4484
4485 * NMU by the security team.
4486 * New upstream version
4487
4488 -- Michael Stone <mstone@debian.org> Wed, 26 Jun 2002 15:40:38 -0400
4489
4490openssh (1:3.3p1-0.0woody4) testing-security; urgency=high
4491
4492 * NMU by the security team.
4493 * fix error when /etc/ssh/sshd_config exists on new install
4494 * check that user doesn't exist before running adduser
4495 * use openssl internal random unconditionally
4496
4497 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 19:44:39 -0400
4498
4499openssh (1:3.3p1-0.0woody3) testing-security; urgency=high
4500
4501 * NMU by the security team.
4502 * use correct home directory when sshd user is created
4503
4504 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
4505
4506openssh (1:3.3p1-0.0woody2) testing-security; urgency=high
4507
4508 * NMU by the security team.
4509 * Fix rsa1 key creation (Closes: #150949)
4510 * don't fail if sshd user removal fails
4511 * depends: on adduser (Closes: #150907)
4512
4513 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
4514
4515openssh (1:3.3p1-0.0woody1) testing-security; urgency=high
4516
4517 * NMU by the security team.
4518 * New upstream version.
4519 - Enable privilege separation by default.
4520 * Include patch from Solar Designer for privilege separation and
4521 compression on 2.2.x kernels.
4522 * Remove --disable-suid-ssh from configure.
4523 * Support setuid ssh-keysign binary instead of setuid ssh client.
4524 * Check sshd configuration before restarting.
4525
4526 -- Daniel Jacobowitz <dan@debian.org> Mon, 24 Jun 2002 13:43:44 -0400
4527
4528openssh (1:3.0.2p1-9) unstable; urgency=high
4529
4530 * Thanks to those who NMUd
4531 * The only change in this version is to debian/control - I've removed
4532 the bit that says you can't export it from the US - it would look
4533 pretty daft to say this about a package in main! Also, it's now OK
4534 to use crypto in France, so I've edited that comment slightly
4535 * Correct a path in README.Debian too (Closes: #138634)
4536
4537 -- Matthew Vernon <matthew@debian.org> Sun, 4 Apr 2002 09:52:59 +0100
4538
4539openssh (1:3.0.2p1-8.3) unstable; urgency=medium
4540
4541 * NMU
4542 * Really set urgency to medium this time (oops)
4543 * Fix priority to standard per override while I'm at it
4544
4545 -- Aaron M. Ucko <ucko@debian.org> Sun, 24 Mar 2002 09:00:08 -0500
4546
4547openssh (1:3.0.2p1-8.2) unstable; urgency=low
4548
4549 * NMU with maintainer's permission
4550 * Prepare for upcoming ssh-nonfree transitional packages per
4551 <http://lists.debian.org/debian-ssh/2002/debian-ssh-200203/msg00008.html>
4552 * Urgency medium because it would really be good to get this into woody
4553 before it releases
4554 * Fix sections to match override file
4555 * Reissued due to clash with non-US -> main move
4556
4557 -- Aaron M. Ucko <ucko@debian.org> Sat, 23 Mar 2002 21:21:52 -0500
4558
4559openssh (1:3.0.2p1-8.1) unstable; urgency=low
4560
4561 * NMU
4562 * Move from non-US to mani
4563
4564 -- LaMont Jones <lamont@debian.org> Thu, 21 Mar 2002 09:33:50 -0700
4565
4566openssh (1:3.0.2p1-8) unstable; urgency=critical
4567
4568 * Security fix - patch from upstream (Closes: #137209, #137210)
4569 * Undo the changes in the unreleased -7, since they appear to break
4570 things here. Accordingly, the code change is minimal, and I'm
4571 happy to get it into testing ASAP
4572
4573 -- Matthew Vernon <matthew@debian.org> Thu, 7 Mar 2002 14:25:23 +0000
4574
4575openssh (1:3.0.2p1-7) unstable; urgency=high
4576
4577 * Build to support IPv6 and IPv4 by default again
4578
4579 -- Matthew Vernon <matthew@debian.org> Sat, 2 Mar 2002 00:25:05 +0000
4580
4581openssh (1:3.0.2p1-6) unstable; urgency=high
4582
4583 * Correct error in the clean target (Closes: #130868)
4584
4585 -- Matthew Vernon <matthew@debian.org> Sat, 26 Jan 2002 00:32:00 +0000
4586
4587openssh (1:3.0.2p1-5) unstable; urgency=medium
4588
4589 * Include the Debian version in our identification, to make it easier to
4590 audit networks for patched versions in future
4591
4592 -- Matthew Vernon <matthew@debian.org> Mon, 21 Jan 2002 17:16:10 +0000
4593
4594openssh (1:3.0.2p1-4) unstable; urgency=medium
4595
4596 * If we're asked to not run sshd, stop any running sshd's first
4597 (Closes: #129327)
4598
4599 -- Matthew Vernon <matthew@debian.org> Wed, 16 Jan 2002 21:24:16 +0000
4600
4601openssh (1:3.0.2p1-3) unstable; urgency=high
4602
4603 * Fix /etc/pam.d/ssh to not set $MAIL (Closes: #128913)
4604 * Remove extra debconf suggestion (Closes: #128094)
4605 * Mmm. speedy bug-fixing :-)
4606
4607 -- Matthew Vernon <matthew@debian.org> Sat, 12 Jan 2002 17:23:58 +0000
4608
4609openssh (1:3.0.2p1-2) unstable; urgency=high
4610
4611 * Fix postinst to not automatically overwrite sshd_config (!)
4612 (Closes: #127842, #127867)
4613 * Add section in README.Debian about the PermitRootLogin setting
4614
4615 -- Matthew Vernon <matthew@debian.org> Sat, 5 Jan 2003 05:26:30 +0000
4616
4617openssh (1:3.0.2p1-1) unstable; urgency=high
4618
4619 * Incorporate fix from Colin's NMU
4620 * New upstream version (fixes the bug Wichert fixed) (Closes: #124035)
4621 * Capitalise IETF (Closes: #125379)
4622 * Refer to the correct sftp-server location (Closes: #126854, #126224)
4623 * Do what we're asked re SetUID ssh (Closes: #124065, #124154, #123247)
4624 * Ask people upgrading from potato if they want a new conffile
4625 (Closes: #125642)
4626 * Fix a typo in postinst (Closes: #122192, #122410, #123440)
4627 * Frob the default config a little (Closes: #122284, #125827, #125696,
4628 #123854)
4629 * Make /etc/init.d/ssh be more clear about ssh not running (Closes:
4630 #123552)
4631 * Fix typo in templates file (Closes: #123411)
4632
4633 -- Matthew Vernon <matthew@debian.org> Fri, 4 Jan 2002 16:01:52 +0000
4634
4635openssh (1:3.0.1p1-1.2) unstable; urgency=high
4636
4637 * Non-maintainer upload
4638 * Prevent local users from passing environment variables to the login
4639 process when UseLogin is enabled
4640
4641 -- Wichert Akkerman <wakkerma@debian.org> Mon, 3 Dec 2001 19:34:45 +0100
4642
4643openssh (1:3.0.1p1-1.1) unstable; urgency=low
4644
4645 * Non-maintainer upload, at Matthew's request.
4646 * Remove sa_restorer assignment to fix compilation on alpha, hppa, and
4647 ia64 (closes: #122086).
4648
4649 -- Colin Watson <cjwatson@debian.org> Sun, 2 Dec 2001 18:54:16 +0000
4650
4651openssh (1:3.0.1p1-1) unstable; urgency=high
4652
4653 * New upstream version (Closes: #113646, #113513, #114707, #118564)
4654 * Building with a libc that works (!) (Closes: #115228)
4655 * Patches forward-ported are -1/-2 options for scp, the improvement to
4656 'waiting for forwarded connections to terminate...'
4657 * Fix /etc/init.d/ssh to stop sshd properly (Closes: #115228)
4658 * /etc/ssh/sshd_config is no longer a conffile but generated in the postinst
4659 * Remove suidregister leftover from postrm
4660 * Mention key we are making in the postinst
4661 * Default to not enable SSH protocol 1 support, since protocol 2 is
4662 much safer anyway.
4663 * New version of the vpn-fixes patch, from Ian Jackson
4664 * New handling of -q, and added new -qq option; thanks to Jon Amery
4665 * Experimental smartcard support not enabled, since I have no way of
4666 testing it.
4667
4668 -- Matthew Vernon <matthew@debian.org> Thu, 28 Nov 2001 17:43:01 +0000
4669
4670openssh (1:2.9p2-6) unstable; urgency=low
4671
4672 * check for correct file in /etc/init.d/ssh (Closes: #110876)
4673 * correct location of version 2 keys in ssh.1 (Closes: #110439)
4674 * call update-alternatives --quiet (Closes: #103314)
4675 * hack ssh-copy-id to chmod go-w (Closes: #95551)
4676 * TEMPORARY fix to provide largefile support using a -D in the cflags
4677 line. long-term, upstream will patch the autoconf stuff
4678 (Closes: #106809, #111849)
4679 * remove /etc/rc references in ssh-keygen.1 (Closes: #68350)
4680 * scp.1 patch from Adam McKenna to document -r properly (Closes: #76054)
4681 * Check for files containing a newline character (Closes: #111692)
4682
4683 -- Matthew Vernon <matthew@debian.org> Thu, 13 Sep 2001 16:47:36 +0100
4684
4685openssh (1:2.9p2-5) unstable; urgency=high
4686
4687 * Thanks to all the bug-fixers who helped!
4688 * remove sa_restorer assignment (Closes: #102837)
4689 * patch from Peter Benie to DTRT wrt X forwarding if the server refuses
4690 us access (Closes: #48297)
4691 * patch from upstream CVS to fix port forwarding (Closes: #107132)
4692 * patch from Jonathan Amery to document ssh-keygen behaviour
4693 (Closes:#106643, #107512)
4694 * patch to postinst from Jonathan Amery (Closes: #106411)
4695 * patch to manpage from Jonathan Amery (Closes: #107364)
4696 * patch from Matthew Vernon to make -q emit fatal errors as that is the
4697 documented behaviour (Closes: #64347)
4698 * patch from Ian Jackson to cause us to destroy a file when we scp it
4699 onto itself, rather than dumping bits of our memory into it, which was
4700 a security hole (see #51955)
4701 * patch from Jonathan Amery to document lack of Kerberos support
4702 (Closes: #103726)
4703 * patch from Matthew Vernon to make the 'waiting for connections to
4704 terminate' message more helpful (Closes: #50308)
4705
4706 -- Matthew Vernon <matthew@debian.org> Thu, 23 Aug 2001 02:14:09 +0100
4707
4708openssh (1:2.9p2-4) unstable; urgency=high
4709
4710 * Today's build of ssh is strawberry flavoured
4711 * Patch from mhp to reduce length of time sshd is stopped for (Closes: #106176)
4712 * Tidy up debconf template (Closes: #106152)
4713 * If called non-setuid, then setgid()'s failure should not be fatal (see
4714 #105854)
4715
4716 -- Matthew Vernon <matthew@debian.org> Sun, 22 Jul 2001 14:19:43 +0100
4717
4718openssh (1:2.9p2-3) unstable; urgency=low
4719
4720 * Patch from yours truly to add -1 and -2 options to scp (Closes: #106061)
4721 * Improve the IdentityFile section in the man page (Closes: #106038)
4722
4723 -- Matthew Vernon <matthew@debian.org> Sat, 21 Jul 2001 14:47:27 +0100
4724
4725openssh (1:2.9p2-2) unstable; urgency=low
4726
4727 * Document the protocol version 2 and IPV6 changes (Closes: #105845, #105868)
4728 * Make PrintLastLog 'no' by default (Closes: #105893)
4729
4730 -- Matthew Vernon <matthew@debian.org> Thu, 19 Jul 2001 18:36:41 +0100
4731
4732openssh (1:2.9p2-1) unstable; urgency=low
4733
4734 * new (several..) upstream version (Closes: #96726, #81856, #96335)
4735 * Hopefully, this will close some other bugs too
4736
4737 -- Matthew Vernon <matthew@debian.org> Tue, 17 Jul 2001 19:41:58 +0100
4738
4739openssh (1:2.5.2p2-3) unstable; urgency=low
4740
4741 * Taking Over this package
4742 * Patches from Robert Bihlmeyer for the Hurd (Closes: #102991)
4743 * Put PermitRootLogin back to yes (Closes: #67334, #67371, #78274)
4744 * Don't fiddle with conf-files any more (Closes: #69501)
4745
4746 -- Matthew Vernon <matthew@debian.org> Tue, 03 Jul 2001 02:58:13 +0100
4747
4748openssh (1:2.5.2p2-2.2) unstable; urgency=low
4749
4750 * NMU
4751 * Include Hurd compatibility patches from Robert Bihlmeyer (Closes: #76033)
4752 * Patch from Richard Kettlewell for protocolkeepalives (Closes: #99273)
4753 * Patch from Matthew Vernon for BannerTimeOut, batchmode, and
4754 documentation for protocolkeepalives. Makes ssh more generally useful
4755 for scripting uses (Closes: #82877, #99275)
4756 * Set a umask, so ourpidfile isn't world-writable (closes: #100012,
4757 #98286, #97391)
4758
4759 -- Matthew Vernon <matthew@debian.org> Thu, 28 Jun 2001 23:15:42 +0100
4760
4761openssh (1:2.5.2p2-2.1) unstable; urgency=low
4762
4763 * NMU
4764 * Remove duplicate Build-Depends for libssl096-dev and change it to
4765 depend on libssl-dev instaed. Also adding in virtual | real package
4766 style build-deps. (Closes: #93793, #75228)
4767 * Removing add-log entry (Closes: #79266)
4768 * This was a pam bug from a while back (Closes: #86908, #88457, #86843)
4769 * pam build-dep already exists (Closes: #93683)
4770 * libgnome-dev build-dep already exists (Closes: #93694)
4771 * No longer in non-free (Closes: #85401)
4772 * Adding in fr debconf translations (Closes: #83783)
4773 * Already suggests xbase-clients (Closes: #79741)
4774 * No need to suggest libpam-pwdb anymore (Closes: #81658)
4775 * Providing rsh-client (Closes: #79437)
4776 * hurd patch was already applied (Closes: #76033)
4777 * default set to no (Closes: #73682)
4778 * Adding in a suggests for dnsutils (Closes: #93265)
4779 * postinst bugs fixed (Closes: #88057, #88066, #88196, #88405, #88612)
4780 (Closes: #88774, #88196, #89556, #90123, #90228, #90833, #87814, #85465)
4781 * Adding in debconf dependency
4782
4783 -- Ivan E. Moore II <rkrusty@debian.org> Mon, 16 Apr 2001 14:11:04 +0100
4784
4785openssh (1:2.5.2p2-2) unstable; urgency=high
4786
4787 * disable the OpenSSL version check in entropy.c
4788 (closes: #93581, #93588, #93590, #93614, #93619, #93635, #93648)
4789
4790 -- Philip Hands <phil@uk.alcove.com> Wed, 11 Apr 2001 20:30:04 +0100
4791
4792openssh (1:2.5.2p2-1) unstable; urgency=low
4793
4794 * New upstream release
4795 * removed make-ssh-known-hosts, since ssh-keyscan does that job (closes: #86069, #87748)
4796 * fix double space indent in german templates (closes: #89493)
4797 * make postinst check for ssh_host_rsa_key
4798 * get rid of the last of the misguided debian/rules NMU debris :-/
4799
4800 -- Philip Hands <phil@hands.com> Sat, 24 Mar 2001 20:59:33 +0000
4801
4802openssh (1:2.5.1p2-2) unstable; urgency=low
4803
4804 * rebuild with new debhelper (closes: #89558, #89536, #90225)
4805 * fix broken dpkg-statoverride test in postinst
4806 (closes: #89612, #90474, #90460, #89605)
4807 * NMU bug fixed but not closed in last upload (closes: #88206)
4808
4809 -- Philip Hands <phil@hands.com> Fri, 23 Mar 2001 16:11:33 +0000
4810
4811openssh (1:2.5.1p2-1) unstable; urgency=high
4812
4813 * New upstream release
4814 * fix typo in postinst (closes: #88110)
4815 * revert to setting PAM service name in debian/rules, backing out last
4816 NMU, which also (closes: #88101)
4817 * restore the pam lastlog/motd lines, lost during the NMUs, and sshd_config
4818 * restore printlastlog option patch
4819 * revert to using debhelper, which had been partially disabled in NMUs
4820
4821 -- Philip Hands <phil@hands.com> Tue, 13 Mar 2001 01:41:34 +0000
4822
4823openssh (1:2.5.1p1-1.8) unstable; urgency=high
4824
4825 * And now the old pam-bug s/sshd/ssh in ssh.c is also fixed
4826
4827 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 19:48:01 +0100
4828
4829openssh (1:2.5.1p1-1.7) unstable; urgency=high
4830
4831 * And now we mark the correct binary as setuid, when a user requested
4832 to install it setuid.
4833
4834 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 07:19:56 +0100
4835
4836openssh (1:2.5.1p1-1.6) unstable; urgency=high
4837
4838 * Fixes postinst to handle overrides that are already there. Damn, I
4839 should have noticed the bug earlier.
4840
4841 -- Christian Kurz <shorty@debian.org> Wed, 28 Feb 2001 22:35:00 +0100
4842
4843openssh (1:2.5.1p1-1.5) unstable; urgency=high
4844
4845 * Rebuild ssh with pam-support.
4846
4847 -- Christian Kurz <shorty@debian.org> Mon, 26 Feb 2001 21:55:51 +0100
4848
4849openssh (1:2.5.1p1-1.4) unstable; urgency=low
4850
4851 * Added Build-Depends on libssl096-dev.
4852 * Fixed sshd_config file to disallow root logins again.
4853
4854 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 20:03:55 +0100
4855
4856openssh (1:2.5.1p1-1.3) unstable; urgency=low
4857
4858 * Fixed missing manpages for sftp.1 and ssh-keyscan.1
4859 * Made package policy 3.5.2 compliant.
4860
4861 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 15:46:26 +0100
4862
4863openssh (1:2.5.1p1-1.2) unstable; urgency=low
4864
4865 * Added Conflict with sftp, since we now provide our own sftp-client.
4866 * Added a fix for our broken dpkg-statoverride call in the
4867 2.3.0p1-13.
4868 * Fixed some config pathes in the comments of sshd_config.
4869 * Removed ssh-key-exchange-vulnerability-patch since it's not needed
4870 anymore because upstream included the fix.
4871
4872 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 13:46:58 +0100
4873
4874openssh (1:2.5.1p1-1.1) unstable; urgency=high
4875
4876 * Another NMU to get the new upstream version 2.5.1p1 into
4877 unstable. (Closes: #87123)
4878 * Corrected postinst to mark ssh as setuid. (Closes: #86391, #85766)
4879 * Key Exchange patch is already included by upstream. (Closes: #86015)
4880 * Upgrading should be possible now. (Closes: #85525, #85523)
4881 * Added --disable-suid-ssh as compile option, so ssh won't get installed
4882 suid per default.
4883 * Fixed postinst to run dpkg-statoverride only, when dpkg-statoverride
4884 is available and the mode of the binary should be 4755. And also added
4885 suggestion for a newer dpkg.
4886 (Closes: #85734, #85741, #86876)
4887 * sftp and ssh-keyscan will also be included from now on. (Closes: #79994)
4888 * scp now understands spaces in filenames (Closes: #53783, #58958,
4889 #66723)
4890 * ssh-keygen now supports showing DSA fingerprints. (Closes: #68623)
4891 * ssh doesn' t show motd anymore when switch -t is used. (Closes #69035)
4892 * ssh supports the usage of other dsa keys via the ssh command line
4893 options. (Closes: #81250)
4894 * Documentation in sshd_config fixed. (Closes: #81088)
4895 * primes file included by upstream and included now. (Closes: #82101)
4896 * scp now allows dots in the username. (Closes: #82477)
4897 * Spelling error in ssh-copy-id.1 corrected by upstream. (Closes: #78124)
4898
4899 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 10:06:08 +0100
4900
4901openssh (1:2.3.0p1-1.13) unstable; urgency=low
4902
4903 * Config should now also be fixed with this hopefully last NMU.
4904
4905 -- Christian Kurz <shorty@debian.org> Sat, 10 Feb 2001 22:56:36 +0100
4906
4907openssh (1:2.3.0p1-1.12) unstable; urgency=high
4908
4909 * Added suggest for xbase-clients to control-file. (Closes #85227)
4910 * Applied patch from Markus Friedl to fix a vulnerability in
4911 the rsa keyexchange.
4912 * Fixed position of horizontal line. (Closes: #83613)
4913 * Fixed hopefully the grep problem in the config-file. (Closes: #78802)
4914 * Converted package from suidregister to dpkg-statoverride.
4915
4916 -- Christian Kurz <shorty@debian.org> Fri, 9 Feb 2001 19:43:55 +0100
4917
4918openssh (1:2.3.0p1-1.11) unstable; urgency=medium
4919
4920 * Fixed some typos in the german translation of the debconf
4921 template.
4922
4923 -- Christian Kurz <shorty@debian.org> Wed, 24 Jan 2001 18:22:38 +0100
4924
4925openssh (1:2.3.0p1-1.10) unstable; urgency=medium
4926
4927 * Fixed double printing of motd. (Closes: #82618)
4928
4929 -- Christian Kurz <shorty@debian.org> Tue, 23 Jan 2001 21:03:43 +0100
4930
4931openssh (1:2.3.0p1-1.9) unstable; urgency=high
4932
4933 * And the next NMU which includes the patch from Andrew Bartlett
4934 and Markus Friedl to fix the root privileges handling of openssh.
4935 (Closes: #82657)
4936
4937 -- Christian Kurz <shorty@debian.org> Wed, 17 Jan 2001 22:20:54 +0100
4938
4939openssh (1:2.3.0p1-1.8) unstable; urgency=high
4940
4941 * Applied fix from Ryan Murray to allow building on other architectures
4942 since the hurd patch was wrong. (Closes: #82471)
4943
4944 -- Christian Kurz <shorty@debian.org> Tue, 16 Jan 2001 22:45:51 +0100
4945
4946openssh (1:2.3.0p1-1.7) unstable; urgency=medium
4947
4948 * Fixed another typo on sshd_config
4949
4950 -- Christian Kurz <shorty@debian.org> Sun, 14 Jan 2001 19:01:31 +0100
4951
4952openssh (1:2.3.0p1-1.6) unstable; urgency=high
4953
4954 * Added Build-Dependency on groff (Closes: #81886)
4955 * Added Build-Depencency on debhelper (Closes: #82072)
4956 * Fixed entry for known_hosts in sshd_config (Closes: #82096)
4957
4958 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 23:08:16 +0100
4959
4960openssh (1:2.3.0p1-1.5) unstable; urgency=high
4961
4962 * Fixed now also the problem with sshd used as default ipv4 and
4963 didn't use IPv6. This should be now fixed.
4964
4965 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 21:25:55 +0100
4966
4967openssh (1:2.3.0p1-1.4) unstable; urgency=high
4968
4969 * Fixed buggy entry in postinst.
4970
4971 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 23:12:16 +0100
4972
4973openssh (1:2.3.0p1-1.3) unstable; urgency=high
4974
4975 * After finishing the rewrite of the rules-file I had to notice that
4976 the manpage installation was broken. This should now work again.
4977
4978 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 22:11:59 +0100
4979
4980openssh (1:2.3.0p1-1.2) unstable; urgency=high
4981
4982 * Fixed the screwed up build-dependency.
4983 * Removed --with-ipv4-default to support ipv6.
4984 * Changed makefile to use /etc/pam.d/ssh instead of /etc/pam.d/sshd.
4985 * Fixed location to sftp-server in config.
4986 * Since debian still relies on /etc/pam.d/ssh instead of moving to
4987 /etc/pam.d/sshd, I had to hack ssh.h to get ssh to use this name.
4988 * Fixed path to host key in sshd_config.
4989
4990 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 08:23:47 +0100
4991
4992openssh (1:2.3.0p1-1.1) unstable; urgency=medium
4993
4994 * NMU with permission of Phil Hands.
4995 * New upstream release
4996 * Update Build-Depends to point to new libssl096.
4997 * This upstream release doesn't leak any information depending
4998 on the setting of PermitRootLogin (Closes: #59933)
4999 * New upstream release contains fix against forcing a client to
5000 do X/agent forwarding (Closes: #76788)
5001 * Changed template to contain correct path to the documentation
5002 (Closes: #67245)
5003 * Added --with-4in6 switch as compile option into debian/rules.
5004 * Added --with-ipv4-default as compile option into debian/rules.
5005 (Closes: #75037)
5006 * Changed default path to also contain /usr/local/bin and
5007 /usr/X11R6/bin (Closes: #62472,#54567,#62810)
5008 * Changed path to sftp-server in sshd_config to match the
5009 our package (Closes: #68347)
5010 * Replaced OpenBSDh with OpenBSD in the init-script.
5011 * Changed location to original source in copyright.head
5012 * Changed behaviour of init-script when invoked with the option
5013 restart (Closes: #68706,#72560)
5014 * Added a note about -L option of scp to README.Debian
5015 * ssh won't print now the motd if invoked with -t option
5016 (Closes: #59933)
5017 * RFC.nroff.gz get's now converted into RFC.gz. (Closes: #63867)
5018 * Added a note about tcp-wrapper support to README.Debian
5019 (Closes: #72807,#22190)
5020 * Removed two unneeded options from building process.
5021 * Added sshd.pam into debian dir and install it.
5022 * Commented out unnecessary call to dh_installinfo.
5023 * Added a line to sshd.pam so that limits will be paid attention
5024 to (Closes: #66904)
5025 * Restart Option has a Timeout of 10 seconds (Closes: 51264)
5026 * scp won't override files anymore (Closes: 51955)
5027 * Removed pam_lastlog module, so that the lastlog is now printed
5028 only once (Closes: #71742, #68335, #69592, #71495, #77781)
5029 * If password is expired, openssh now forces the user to change it.
5030 (Closes: #51747)
5031 * scp should now have no more problems with shell-init-files that
5032 produces ouput (Closes: #56280,#59873)
5033 * ssh now prints the motd correctly (Closes: #66926)
5034 * ssh upgrade should disable ssh daemon only if users has choosen
5035 to do so (Closes: #67478)
5036 * ssh can now be installed suid (Closes: #70879)
5037 * Modified debian/rules to support hurd.
5038
5039 -- Christian Kurz <shorty@debian.org> Wed, 27 Dec 2000 20:06:57 +0100
5040
5041openssh (1:2.2.0p1-1.1) unstable; urgency=medium
5042
5043 * Non-Maintainer Upload
5044 * Check for new returns in the new libc
5045 (closes: #72803, #74393, #72797, #71307, #71702)
5046 * Link against libssl095a (closes: #66304)
5047 * Correct check for PermitRootLogin (closes: #69448)
5048
5049 -- Ryan Murray <rmurray@debian.org> Wed, 18 Oct 2000 00:48:18 -0700
5050
5051openssh (1:2.2.0p1-1) unstable; urgency=low
5052
5053 * New upstream release
5054
5055 -- Philip Hands <phil@hands.com> Mon, 11 Sep 2000 14:49:43 +0100
5056
5057openssh (1:2.1.1p4-3) unstable; urgency=low
5058
5059 * add rsh alternatives
5060 * add -S option to scp (using Tommi Virtanen's patch) (closes: #63097)
5061 * do the IPV4_DEFAULT thing properly this time
5062
5063 -- Philip Hands <phil@hands.com> Fri, 11 Aug 2000 18:14:37 +0100
5064
5065openssh (1:2.1.1p4-2) unstable; urgency=low
5066
5067 * reinstate manpage .out patch from 1:1.2.3
5068 * fix typo in postinst
5069 * only compile ssh with IPV4_DEFAULT
5070 * apply James Troup's patch to add a -o option to scp and updated manpage
5071
5072 -- Philip Hands <phil@hands.com> Sun, 30 Jul 2000 00:12:49 +0100
5073
5074openssh (1:2.1.1p4-1) unstable; urgency=low
5075
5076 * New upstream release
5077
5078 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 14:46:16 +0100
5079
5080openssh (1:1.2.3-10) unstable; urgency=low
5081
5082 * add version to libpam-modules dependency, because old versions of
5083 pam_motd make it impossible to log in.
5084
5085 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 13:28:22 +0100
5086
5087openssh (1:1.2.3-9) frozen unstable; urgency=low
5088
5089 * force location of /usr/bin/X11/xauth
5090 (closes: #64424, #66437, #66859) *RC*
5091 * typos in config (closes: #66779, #66780)
5092 * sshd_not_to_be_run could be assumed to be true, in error, if the config
5093 script died in an unusual way --- I've reversed this (closes: #66335)
5094 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to ssh-askpass-ptk
5095 (closes: #65981)
5096 * change default for PermitRootLogin to "no" (closes: #66406)
5097
5098 -- Philip Hands <phil@hands.com> Tue, 11 Jul 2000 20:51:18 +0100
5099
5100openssh (1:1.2.3-8) frozen unstable; urgency=low
5101
5102 * get rid of Provides: rsh-server (this will mean that rstartd
5103 will need to change it's depends to deal with #63948, which I'm
5104 reopening) (closes: #66257)
5105 Given that this is also a trivial change, and is a reversal of a
5106 change that was mistakenly made after the freeze, I think this should
5107 also go into frozen.
5108
5109 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:26:30 +0100
5110
5111openssh (1:1.2.3-7) frozen unstable; urgency=low
5112
5113 * check if debconf is installed before calling db_stop in postinst.
5114 This is required to allow ssh to be installed when debconf is not
5115 wanted, which probably makes it an RC upload (hopefully the last of
5116 too many).
5117
5118 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:19:47 +0100
5119
5120openssh (1:1.2.3-6) frozen unstable; urgency=low
5121
5122 * fixed depressing little bug involving a line wrap looking like
5123 a blank line in the templates file *RC*
5124 (closes: #66090, #66078, #66083, #66182)
5125
5126 -- Philip Hands <phil@hands.com> Mon, 26 Jun 2000 00:45:05 +0100
5127
5128openssh (1:1.2.3-5) frozen unstable; urgency=low
5129
5130 * add code to prevent UseLogin exploit, although I think our PAM
5131 conditional code breaks UseLogin in a way that protects us from this
5132 exploit anyway. ;-) (closes: #65495) *RC*
5133 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to fix keyboard
5134 grab vulnerability in ssh-askpass-gnome (closes: #64795) *RC*
5135 * stop redirection of sshd's file descriptors (introduced in 1:1.2.3-3)
5136 and use db_stop in the postinst to solve that problem instead
5137 (closes: #65104)
5138 * add Provides: rsh-server to ssh (closes: #63948)
5139 * provide config option not to run sshd
5140
5141 -- Philip Hands <phil@hands.com> Mon, 12 Jun 2000 23:05:11 +0100
5142
5143openssh (1:1.2.3-4) frozen unstable; urgency=low
5144
5145 * fixes #63436 which is *RC*
5146 * add 10 second pause in init.d restart (closes: #63844)
5147 * get rid of noenv in PAM mail line (closes: #63856)
5148 * fix host key path in make-ssh-known-hosts (closes: #63713)
5149 * change wording of SUID template (closes: #62788, #63436)
5150
5151 -- Philip Hands <phil@hands.com> Sat, 27 May 2000 11:18:06 +0100
5152
5153openssh (1:1.2.3-3) frozen unstable; urgency=low
5154
5155 * redirect sshd's file descriptors to /dev/null in init to
5156 prevent debconf from locking up during installation
5157 ** grave bug just submited by me **
5158
5159 -- Philip Hands <phil@hands.com> Thu, 20 Apr 2000 17:10:59 +0100
5160
5161openssh (1:1.2.3-2) frozen unstable; urgency=low
5162
5163 * allow user to select SUID status of /usr/bin/ssh (closes: 62462) ** RC **
5164 * suggest debconf
5165 * conflict with debconf{,-tiny} (<<0.2.17) so I can clean up the preinst
5166
5167 -- Philip Hands <phil@hands.com> Wed, 19 Apr 2000 17:49:15 +0100
5168
5169openssh (1:1.2.3-1) frozen unstable; urgency=low
5170
5171 * New upstream release
5172 * patch sshd to create extra xauth key required for localhost
5173 (closes: #49944) *** RC ***
5174 * FallbacktoRsh now defaults to ``no'' to match impression
5175 given in sshd_config
5176 * stop setting suid bit on ssh (closes: #58711, #58558)
5177 This breaks Rhosts authentication (which nobody uses) and allows
5178 the LD_PRELOAD trick to get socks working, so seems like a net benefit.
5179
5180 -- Philip Hands <phil@hands.com> Thu, 13 Apr 2000 20:01:54 +0100
5181
5182openssh (1:1.2.2-1.4) frozen unstable; urgency=low
5183
5184 * Recompile for frozen, contains fix for RC bug.
5185
5186 -- Tommi Virtanen <tv@debian.org> Tue, 29 Feb 2000 22:14:58 +0200
5187
5188openssh (1:1.2.2-1.3) unstable; urgency=low
5189
5190 * Integrated man page addition for PrintLastLog.
5191 This bug was filed on "openssh", and I ended up
5192 creating my own patch for this (closes: #59054)
5193 * Improved error message when ssh_exchange_identification
5194 gets EOF (closes: #58904)
5195 * Fixed typo (your -> you're) in debian/preinst.
5196 * Added else-clauses to config to make this upgradepath possible:
5197 oldssh -> openssh preinst fails due to upgrade_to_openssh=false
5198 -> ssh-nonfree -> openssh. Without these, debconf remembered
5199 the old answer, config didn't force asking it, and preinst always
5200 aborted (closes: #56596, #57782)
5201 * Moved setting upgrade_to_openssh isdefault flag to the place
5202 where preinst would abort. This means no double question to most
5203 users, people who currently suffer from "can't upgrade" may need
5204 to run apt-get install ssh twice. Did not do the same for
5205 use_old_init_script, as the situation is a bit different, and
5206 less common (closes: #54010, #56224)
5207 * Check for existance of ssh-keygen before attempting to use it in
5208 preinst, added warning for non-existant ssh-keygen in config. This
5209 happens when the old ssh is removed (say, due to ssh-nonfree getting
5210 installed).
5211
5212 -- Tommi Virtanen <tv@debian.org> Sun, 27 Feb 2000 21:36:43 +0200
5213
5214openssh (1:1.2.2-1.2) frozen unstable; urgency=low
5215
5216 * Non-maintainer upload.
5217 * Added configuration option PrintLastLog, default off due to PAM
5218 (closes: #54007, #55042)
5219 * ssh-askpass-{gnome,ptk} now provide ssh-askpass, making ssh's
5220 Suggests: line more accurate. Also closing related bugs fixed
5221 earlier, when default ssh-askpass moved to /usr/bin.
5222 (closes: #52403, #54741, #50607, #52298, #50967, #51661)
5223 * Patched to call vhangup, with autoconf detection and all
5224 (closes: #55379)
5225 * Added --with-ipv4-default workaround to a glibc bug causing
5226 slow DNS lookups, as per UPGRADING. Use -6 to really use
5227 IPv6 addresses. (closes: #57891, #58744, #58713, #57970)
5228 * Added noenv to PAM pam_mail line. Thanks to Ben Collins.
5229 (closes: #58429)
5230 * Added the UPGRADING file to the package.
5231 * Added frozen to the changelog line and recompiled before
5232 package was installed into the archive.
5233
5234 -- Tommi Virtanen <tv@debian.org> Fri, 25 Feb 2000 22:08:57 +0200
5235
5236openssh (1:1.2.2-1.1) frozen unstable; urgency=low
5237
5238 * Non-maintainer upload.
5239 * Integrated scp pipe buffer patch from Ben Collins
5240 <benc@debian.org>, should now work even if reading
5241 a pipe gives less than fstat st_blksize bytes.
5242 Should now work on Alpha and Sparc Linux (closes: #53697, #52071)
5243 * Made ssh depend on libssl09 (>= 0.9.4-3) (closes: #51393)
5244 * Integrated patch from Ben Collins <benc@debian.org>
5245 to do full shadow account locking and expiration
5246 checking (closes: #58165, #51747)
5247
5248 -- Tommi Virtanen <tv@debian.org> Tue, 22 Feb 2000 20:46:12 +0200
5249
5250openssh (1:1.2.2-1) frozen unstable; urgency=medium
5251
5252 * New upstream release (closes: #56870, #56346)
5253 * built against new libesd (closes: #56805)
5254 * add Colin Watson <cjw44@cam.ac.uk> =NULL patch
5255 (closes: #49902, #54894)
5256 * use socketpairs as suggested by Andrew Tridgell to eliminate rsync
5257 (and other) lockups
5258 * patch SSHD_PAM_SERVICE back into auth-pam.c, again :-/
5259 (closes: #49902, #55872, #56959)
5260 * uncoment the * line in ssh_config (closes: #56444)
5261
5262 * #54894 & #49902 are release critical, so this should go in frozen
5263
5264 -- Philip Hands <phil@hands.com> Wed, 9 Feb 2000 04:52:04 +0000
5265
5266openssh (1:1.2.1pre24-1) unstable; urgency=low
5267
5268 * New upstream release
5269
5270 -- Philip Hands <phil@hands.com> Fri, 31 Dec 1999 02:47:24 +0000
5271
5272openssh (1:1.2.1pre23-1) unstable; urgency=low
5273
5274 * New upstream release
5275 * excape ? in /etc/init.d/ssh (closes: #53269)
5276
5277 -- Philip Hands <phil@hands.com> Wed, 29 Dec 1999 16:50:46 +0000
5278
5279openssh (1:1.2pre17-1) unstable; urgency=low
5280
5281 * New upstream release
5282
5283 -- Philip Hands <phil@hands.com> Thu, 9 Dec 1999 16:50:40 +0000
5284
5285openssh (1:1.2pre16-1) unstable; urgency=low
5286
5287 * New upstream release
5288 * upstream release (1.2pre14) (closes: #50299)
5289 * make ssh depend on libwrap0 (>= 7.6-1.1) (closes: #50973, #50776)
5290 * dispose of grep -q broken pipe message in config script (closes: #50855)
5291 * add make-ssh-known-hosts (closes: #50660)
5292 * add -i option to ssh-copy-id (closes: #50657)
5293 * add check for *LK* in password, indicating a locked account
5294
5295 -- Philip Hands <phil@hands.com> Wed, 8 Dec 1999 22:59:38 +0000
5296
5297openssh (1:1.2pre13-1) unstable; urgency=low
5298
5299 * New upstream release
5300 * make sshd.c use SSHD_PAM_SERVICE and define it as "ssh" in debian/rules
5301 * remove duplicate line in /etc/pam.d/ssh (closes: #50310)
5302 * mention ssh -A option in ssh.1 & ssh_config
5303 * enable forwarding to localhost in default ssh_config (closes: #50373)
5304 * tweak preinst to deal with debconf being `unpacked'
5305 * use --with-tcp-wrappers (closes: #49545)
5306
5307 -- Philip Hands <phil@hands.com> Sat, 20 Nov 1999 14:20:04 +0000
5308
5309openssh (1:1.2pre11-2) unstable; urgency=low
5310
5311 * oops, just realised that I forgot to strip out the unpleasant
5312 fiddling mentioned below (which turned not to be a fix anyway)
5313
5314 -- Philip Hands <phil@hands.com> Mon, 15 Nov 1999 01:35:23 +0000
5315
5316openssh (1:1.2pre11-1) unstable; urgency=low
5317
5318 * New upstream release (closes: #49722)
5319 * add 2>/dev/null to dispose of spurious message casused by grep -q
5320 (closes: #49876, #49604)
5321 * fix typo in debian/control (closes: #49841)
5322 * Do some unpleasant fiddling with upgraded keys in the preinst, which
5323 should make the keylength problem go away. (closes: #49676)
5324 * make pam_start in sshd use ``ssh'' as the service name (closes: #49956)
5325 * If /etc/ssh/NOSERVER exist, stop sshd from starting (closes: #47107)
5326 * apply Ben Collins <bcollins@debian.org>'s shadow patch
5327 * disable lastlogin and motd printing if using pam (closes: #49957)
5328 * add ssh-copy-id script and manpage
5329
5330 -- Philip Hands <phil@hands.com> Fri, 12 Nov 1999 01:03:38 +0000
5331
5332openssh (1:1.2pre9-1) unstable; urgency=low
5333
5334 * New upstream release
5335 * apply Chip Salzenberg <chip@valinux.com>'s SO_REUSEADDR patch
5336 to channels.c, to make forwarded ports instantly reusable
5337 * replace Pre-Depend: debconf with some check code in preinst
5338 * make the ssh-add ssh-askpass failure message more helpful
5339 * fix the ssh-agent getopts bug (closes: #49426)
5340 * fixed typo on Suggests: line (closes: #49704, #49571)
5341 * tidy up ssh package description (closes: #49642)
5342 * make ssh suid (closes: #49635)
5343 * in preinst upgrade code, ensure ssh_host_keys is mode 600 (closes: #49606)
5344 * disable agent forwarding by default, for the similar reasons as
5345 X forwarding (closes: #49586)
5346
5347 -- Philip Hands <phil@hands.com> Tue, 9 Nov 1999 09:57:47 +0000
5348
5349openssh (1:1.2pre7-4) unstable; urgency=low
5350
5351 * predepend on debconf (>= 0.2.17) should now allow preinst questions
5352
5353 -- Philip Hands <phil@hands.com> Sat, 6 Nov 1999 10:31:06 +0000
5354
5355openssh (1:1.2pre7-3) unstable; urgency=low
5356
5357 * add ssh-askpass package using Tommi Virtanen's perl-tk script
5358 * add ssh-preconfig package cludge
5359 * add usage hints to ssh-agent.1
5360
5361 -- Philip Hands <phil@hands.com> Fri, 5 Nov 1999 00:38:33 +0000
5362
5363openssh (1:1.2pre7-2) unstable; urgency=low
5364
5365 * use pam patch from Ben Collins <bcollins@debian.org>
5366 * add slogin symlink to Makefile.in
5367 * change /usr/bin/login to LOGIN_PROGRAM define of /bin/login
5368 * sort out debconf usage
5369 * patch from Tommi Virtanen <tv@debian.org>'s makes ssh-add use ssh-askpass
5370
5371 -- Philip Hands <phil@hands.com> Thu, 4 Nov 1999 11:08:54 +0000
5372
5373openssh (1:1.2pre7-1) unstable; urgency=low
5374
5375 * New upstream release
5376
5377 -- Philip Hands <phil@hands.com> Tue, 2 Nov 1999 21:02:37 +0000
5378
5379openssh (1:1.2.0.pre6db1-2) unstable; urgency=low
5380
5381 * change the binary package name to ssh (the non-free branch of ssh has
5382 been renamed to ssh-nonfree)
5383 * make pam file comply with Debian standards
5384 * use an epoch to make sure openssh supercedes ssh-nonfree
5385
5386 -- Philip Hands <phil@hands.com> Sat, 30 Oct 1999 16:26:05 +0100
5387
5388openssh (1.2pre6db1-1) unstable; urgency=low
5389
5390 * New upstream source
5391 * sshd accepts logins now!
5392
5393 -- Dan Brosemer <odin@linuxfreak.com> Fri, 29 Oct 1999 11:13:38 -0500
5394
5395openssh (1.2.0.19991028-1) unstable; urgency=low
5396
5397 * New upstream source
5398 * Added test for -lnsl to configure script
5399
5400 -- Dan Brosemer <odin@linuxfreak.com> Thu, 28 Oct 1999 18:52:09 -0500
5401
5402openssh (1.2.0.19991027-3) unstable; urgency=low
5403
5404 * Initial release
5405
5406 -- 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..0e4388429
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,231 @@
1Source: openssh
2Section: net
3Priority: standard
4Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
5Build-Depends: autotools-dev,
6 debhelper (>= 9.20160709~),
7 dh-autoreconf,
8 dh-exec,
9 dpkg-dev (>= 1.16.1~),
10 libaudit-dev [linux-any],
11 libedit-dev,
12 libgtk-3-dev <!pkg.openssh.nognome>,
13 libkrb5-dev | heimdal-dev,
14 libpam0g-dev | libpam-dev,
15 libselinux1-dev [linux-any],
16 libssl-dev (>= 1.1.0g),
17 libsystemd-dev [linux-any],
18 libwrap0-dev | libwrap-dev,
19 pkg-config,
20 zlib1g-dev (>= 1:1.2.3),
21Standards-Version: 4.1.0
22Uploaders: Colin Watson <cjwatson@debian.org>,
23 Matthew Vernon <matthew@debian.org>,
24Homepage: http://www.openssh.com/
25Vcs-Git: https://salsa.debian.org/ssh-team/openssh.git
26Vcs-Browser: https://salsa.debian.org/ssh-team/openssh
27
28Package: openssh-client
29Architecture: any
30Depends: adduser (>= 3.10),
31 dpkg (>= 1.7.0),
32 passwd,
33 ${misc:Depends},
34 ${shlibs:Depends},
35Recommends: xauth,
36Conflicts: sftp,
37Replaces: ssh,
38 ssh-krb5,
39Suggests: keychain,
40 libpam-ssh,
41 monkeysphere,
42 ssh-askpass,
43Provides: rsh-client,
44 ssh-client,
45Multi-Arch: foreign
46Description: secure shell (SSH) client, for secure access to remote machines
47 This is the portable version of OpenSSH, a free implementation of
48 the Secure Shell protocol as specified by the IETF secsh working
49 group.
50 .
51 Ssh (Secure Shell) is a program for logging into a remote machine
52 and for executing commands on a remote machine.
53 It provides secure encrypted communications between two untrusted
54 hosts over an insecure network. X11 connections and arbitrary TCP/IP
55 ports can also be forwarded over the secure channel.
56 It can be used to provide applications with a secure communication
57 channel.
58 .
59 This package provides the ssh, scp and sftp clients, the ssh-agent
60 and ssh-add programs to make public key authentication more convenient,
61 and the ssh-keygen, ssh-keyscan, ssh-copy-id and ssh-argv0 utilities.
62 .
63 In some countries it may be illegal to use any encryption at all
64 without a special permit.
65 .
66 ssh replaces the insecure rsh, rcp and rlogin programs, which are
67 obsolete for most purposes.
68
69Package: openssh-server
70Priority: optional
71Architecture: any
72Pre-Depends: ${misc:Pre-Depends},
73Depends: adduser (>= 3.9),
74 dpkg (>= 1.9.0),
75 libpam-modules (>= 0.72-9),
76 libpam-runtime (>= 0.76-14),
77 lsb-base (>= 4.1+Debian3),
78 openssh-client (= ${binary:Version}),
79 openssh-sftp-server,
80 procps,
81 ucf (>= 0.28),
82 ${misc:Depends},
83 ${shlibs:Depends},
84Recommends: default-logind | logind | libpam-systemd,
85 ncurses-term,
86 xauth,
87 ${openssh-server:Recommends},
88Conflicts: sftp,
89 ssh-socks,
90 ssh2,
91Replaces: openssh-client (<< 1:7.9p1-8),
92 ssh,
93 ssh-krb5,
94Suggests: molly-guard,
95 monkeysphere,
96 rssh,
97 ssh-askpass,
98 ufw,
99Provides: ssh-server,
100Multi-Arch: foreign
101Description: secure shell (SSH) server, for secure access from remote machines
102 This is the portable version of OpenSSH, a free implementation of
103 the Secure Shell protocol as specified by the IETF secsh working
104 group.
105 .
106 Ssh (Secure Shell) is a program for logging into a remote machine
107 and for executing commands on a remote machine.
108 It provides secure encrypted communications between two untrusted
109 hosts over an insecure network. X11 connections and arbitrary TCP/IP
110 ports can also be forwarded over the secure channel.
111 It can be used to provide applications with a secure communication
112 channel.
113 .
114 This package provides the sshd server.
115 .
116 In some countries it may be illegal to use any encryption at all
117 without a special permit.
118 .
119 sshd replaces the insecure rshd program, which is obsolete for most
120 purposes.
121
122Package: openssh-sftp-server
123Priority: optional
124Architecture: any
125Depends: ${misc:Depends},
126 ${shlibs:Depends},
127Recommends: openssh-server | ssh-server,
128Breaks: openssh-server (<< 1:6.5p1-5),
129Replaces: openssh-server (<< 1:6.5p1-5),
130Enhances: openssh-server,
131 ssh-server,
132Description: secure shell (SSH) sftp server module, for SFTP access from remote machines
133 This is the portable version of OpenSSH, a free implementation of
134 the Secure Shell protocol as specified by the IETF secsh working
135 group.
136 .
137 Ssh (Secure Shell) is a program for logging into a remote machine
138 and for executing commands on a remote machine.
139 It provides secure encrypted communications between two untrusted
140 hosts over an insecure network. X11 connections and arbitrary TCP/IP
141 ports can also be forwarded over the secure channel.
142 It can be used to provide applications with a secure communication
143 channel.
144 .
145 This package provides the SFTP server module for the SSH server. It
146 is needed if you want to access your SSH server with SFTP. The SFTP
147 server module also works with other SSH daemons like dropbear.
148 .
149 OpenSSH's sftp and sftp-server implement revision 3 of the SSH filexfer
150 protocol described in:
151 .
152 http://www.openssh.com/txt/draft-ietf-secsh-filexfer-02.txt
153 .
154 Newer versions of the draft will not be supported, though some features
155 are individually implemented as extensions.
156
157Package: openssh-tests
158Priority: optional
159Architecture: any
160Depends: openssh-client (= ${binary:Version}),
161 openssh-server (= ${binary:Version}),
162 openssh-sftp-server (= ${binary:Version}),
163 openssl,
164 putty-tools (>= 0.67-2),
165 python-twisted-conch (>= 1:15.5.0-1),
166 ${misc:Depends},
167 ${shlibs:Depends},
168Description: OpenSSH regression tests
169 This package provides OpenSSH's regression test suite. It is mainly
170 intended for use with the autopkgtest system, though can also be run
171 directly using /usr/lib/openssh/regress/run-tests.
172
173Package: ssh
174Priority: optional
175Architecture: all
176Pre-Depends: dpkg (>= 1.17.5),
177Depends: openssh-client (>= ${binary:Version}),
178 openssh-server (>= ${binary:Version}),
179 ${misc:Depends},
180Description: secure shell client and server (metapackage)
181 This metapackage is a convenient way to install both the OpenSSH client
182 and the OpenSSH server. It provides nothing in and of itself, so you
183 may remove it if nothing depends on it.
184
185Package: ssh-askpass-gnome
186Build-Profiles: <!pkg.openssh.nognome>
187Section: gnome
188Priority: optional
189Architecture: any
190Depends: openssh-client | ssh (>= 1:1.2pre7-4),
191 ${misc:Depends},
192 ${shlibs:Depends},
193Replaces: ssh (<< 1:3.5p1-3),
194Provides: ssh-askpass,
195Description: interactive X program to prompt users for a passphrase for ssh-add
196 This has been split out of the main openssh-client package so that
197 openssh-client does not need to depend on GTK+.
198 .
199 You probably want the ssh-askpass package instead, but this is
200 provided to add to your choice and/or confusion.
201
202Package: openssh-client-udeb
203Build-Profiles: <!noudeb>
204Package-Type: udeb
205Section: debian-installer
206Priority: optional
207Architecture: any
208Depends: ${shlibs:Depends},
209XB-Installer-Menu-Item: 99999
210Description: secure shell client for the Debian installer
211 This is the portable version of OpenSSH, a free implementation of
212 the Secure Shell protocol as specified by the IETF secsh working
213 group.
214 .
215 This package provides the ssh client for use in debian-installer.
216
217Package: openssh-server-udeb
218Build-Profiles: <!noudeb>
219Package-Type: udeb
220Section: debian-installer
221Priority: optional
222Architecture: any
223Depends: ${shlibs:Depends},
224Description: secure shell server for the Debian installer
225 This is the portable version of OpenSSH, a free implementation of
226 the Secure Shell protocol as specified by the IETF secsh working
227 group.
228 .
229 This package provides the sshd server for use in debian-installer.
230 Since it is expected to be used in specialized situations (e.g. S/390
231 installs with no console), it does not provide any configuration.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..ef1bc8e69
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,247 @@
1Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: OpenSSH
3Upstream-Contact: openssh-unix-dev@mindrot.org
4Source: http://www.openssh.com/portable.html
5Comment:
6 The overall licence of the OpenSSH upstream code amounts to BSD-3-clause or
7 various less restrictive licences, with the additional restrictions that
8 derived versions must be clearly marked as such and that if derived works
9 are incompatible with the RFC-specified protocol then they must be called
10 by a name other than "ssh" or "Secure Shell".
11
12Files: *
13Copyright:
14 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
15 Markus Friedl
16 Theo de Raadt
17 Niels Provos
18 Dug Song
19 Aaron Campbell
20 Damien Miller
21 Kevin Steves
22 Daniel Kouril
23 Wesley Griffin
24 Per Allansson
25 Nils Nordman
26 Simon Wilkinson
27 Ben Lindstrom
28 Tim Rice
29 Andre Lucas
30 Chris Adams
31 Corinna Vinschen
32 Cray Inc.
33 Denis Parker
34 Gert Doering
35 Jakob Schlyter
36 Jason Downs
37 Juha Yrjölä
38 Michael Stone
39 Networks Associates Technology, Inc.
40 Solar Designer
41 Todd C. Miller
42 Wayne Schroeder
43 William Jones
44 Darren Tucker
45 Sun Microsystems
46 The SCO Group
47 Daniel Walsh
48 Red Hat, Inc
49 Simon Vallet / Genoscope
50 Internet Software Consortium
51 Reyk Floeter
52 Chad Mynhier
53License: OpenSSH
54 Tatu Ylonen's original licence is as follows (excluding some terms about
55 third-party code which are no longer relevant; see the LICENCE file for
56 details):
57 .
58 As far as I am concerned, the code I have written for this software
59 can be used freely for any purpose. Any derived versions of this
60 software must be clearly marked as such, and if the derived work is
61 incompatible with the protocol description in the RFC file, it must be
62 called by a name other than "ssh" or "Secure Shell".
63 .
64 Note that any information and cryptographic algorithms used in this
65 software are publicly available on the Internet and at any major
66 bookstore, scientific library, and patent office worldwide. More
67 information can be found e.g. at "http://www.cs.hut.fi/crypto".
68 .
69 The legal status of this program is some combination of all these
70 permissions and restrictions. Use only at your own responsibility.
71 You will be responsible for any legal consequences yourself; I am not
72 making any claims whether possessing or using this is legal or not in
73 your country, and I am not taking any responsibility on your behalf.
74 .
75 Most remaining components of the software are provided under a standard
76 2-term BSD licence:
77 .
78 Redistribution and use in source and binary forms, with or without
79 modification, are permitted provided that the following conditions
80 are met:
81 1. Redistributions of source code must retain the above copyright
82 notice, this list of conditions and the following disclaimer.
83 2. Redistributions in binary form must reproduce the above copyright
84 notice, this list of conditions and the following disclaimer in the
85 documentation and/or other materials provided with the distribution.
86 .
87 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
88 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
89 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
90 IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
91 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
92 NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
93 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
94 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
95 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
96 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
97 .
98 Some code is licensed under an ISC-style license, to the following
99 copyright holders:
100 .
101 Permission to use, copy, modify, and distribute this software for any
102 purpose with or without fee is hereby granted, provided that the above
103 copyright notice and this permission notice appear in all copies.
104 .
105 THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL
106 WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
107 OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE
108 FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
109 WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
110 OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
111 CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
112
113Files: ssh-keyscan.*
114Copyright: 1995, 1996 David Mazieres <dm@lcs.mit.edu>
115License: Mazieres-BSD-style
116 Modification and redistribution in source and binary forms is
117 permitted provided that due credit is given to the author and the
118 OpenBSD project by leaving this copyright notice intact.
119
120Files: rijndael.*
121License: public-domain
122 This code is from a reference implementation of the Rijndael cipher which
123 has been dedicated to the public domain.
124 .
125 @version 3.0 (December 2000)
126 .
127 Optimised ANSI C code for the Rijndael cipher (now AES)
128 .
129 @author Vincent Rijmen <vincent.rijmen@esat.kuleuven.ac.be>
130 @author Antoon Bosselaers <antoon.bosselaers@esat.kuleuven.ac.be>
131 @author Paulo Barreto <paulo.barreto@terra.com.br>
132 .
133 This code is hereby placed in the public domain.
134 .
135 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ''AS IS'' AND ANY EXPRESS
136 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
137 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
138 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
139 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
140 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
141 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
142 BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
143 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
144 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
145 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
146
147Files: loginrec.c openbsd-compat/* scp.c
148Copyright:
149 1983, 1995-1997 Eric P. Allman
150 1999 Aaron Campbell
151 1993 by Digital Equipment Corporation
152 2000 Andre Lucas
153 1999-2010 Damien Miller
154 1997-2010 Todd C. Miller
155 1995, 1996, 1998, 1999, 2008 Theo de Raadt
156 2003 Constantin S. Svintsoff <kostik@iclub.nsu.ru>
157 1980, 1983, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995 The Regents of the University of California
158License: BSD-3-clause
159 Redistribution and use in source and binary forms, with or without
160 modification, are permitted provided that the following conditions
161 are met:
162 1. Redistributions of source code must retain the above copyright
163 notice, this list of conditions and the following disclaimer.
164 2. Redistributions in binary form must reproduce the above copyright
165 notice, this list of conditions and the following disclaimer in the
166 documentation and/or other materials provided with the distribution.
167 3. Neither the name of the University nor the names of its contributors
168 may be used to endorse or promote products derived from this software
169 without specific prior written permission.
170 .
171 THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
172 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
173 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
174 ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
175 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
176 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
177 OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
178 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
179 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
180 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
181 SUCH DAMAGE.
182
183Files: md5crypt.*
184Copyright: Poul-Henning Kamp
185License: Beer-ware
186 "THE BEER-WARE LICENSE" (Revision 42):
187 <phk@login.dknet.dk> wrote this file. As long as you retain this
188 notice you can do whatever you want with this stuff. If we meet
189 some day, and you think this stuff is worth it, you can buy me a
190 beer in return. Poul-Henning Kamp
191
192Files: openbsd-compat/bsd-snprintf.c
193Copyright: 1995 Patrick Powell
194License: Powell-BSD-style
195 This code is based on code written by Patrick Powell
196 (papowell@astart.com) It may be used for any purpose as long as this
197 notice remains intact on all source code distributions
198
199Files: openbsd-compat/sigact.*
200Copyright: 1998, 2000 Free Software Foundation, Inc.
201License: Expat-with-advertising-restriction
202 Permission is hereby granted, free of charge, to any person obtaining a
203 copy of this software and associated documentation files (the
204 "Software"), to deal in the Software without restriction, including
205 without limitation the rights to use, copy, modify, merge, publish,
206 distribute, distribute with modifications, sublicense, and/or sell
207 copies of the Software, and to permit persons to whom the Software is
208 furnished to do so, subject to the following conditions:
209 .
210 The above copyright notice and this permission notice shall be included
211 in all copies or substantial portions of the Software.
212 .
213 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
214 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
215 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
216 IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
217 DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
218 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
219 THE USE OR OTHER DEALINGS IN THE SOFTWARE.
220 .
221 Except as contained in this notice, the name(s) of the above copyright
222 holders shall not be used in advertising or otherwise to promote the
223 sale, use or other dealings in this Software without prior written
224 authorization.
225
226Files: debian/*
227Copyright: Matthew Vernon, Colin Watson
228License: BSD-2-clause
229 Redistribution and use in source and binary forms, with or without
230 modification, are permitted provided that the following conditions
231 are met:
232 1. Redistributions of source code must retain the above copyright
233 notice, this list of conditions and the following disclaimer.
234 2. Redistributions in binary form must reproduce the above copyright
235 notice, this list of conditions and the following disclaimer in the
236 documentation and/or other materials provided with the distribution.
237 .
238 THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
239 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
240 OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
241 IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
242 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
243 NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
244 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
245 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
246 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
247 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/faq.html b/debian/faq.html
new file mode 100644
index 000000000..7f0252891
--- /dev/null
+++ b/debian/faq.html
@@ -0,0 +1,1187 @@
1<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2<html>
3<head>
4<title>OpenSSH FAQ</title>
5<link rev= "made" href= "mailto:www@openbsd.org">
6<meta name= "resource-type" content= "document">
7<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
8<meta name= "description" content= "the OpenSSH FAQ page">
9<meta name= "keywords" content= "OpenSSH,SSH,Secure Shell,faq">
10<meta name= "distribution" content= "global">
11<meta name= "copyright" content= "This document copyright 1999-2010 OpenBSD.">
12</head>
13
14<body bgcolor= "#ffffff" text= "#000000" link= "#23238E">
15<a href="http://www.openssh.com/index.html"><img alt="[OpenSSH]" height="30" width="141" src="images/smalltitle.gif" border="0"></a>
16<p>
17
18<h1>OpenSSH FAQ (Frequently asked questions)</h1>
19
20<hr>
21
22<blockquote>
23<h3><a href= "#1.0">1.0 - What Is OpenSSH and Where Can I Get It?</a></h3>
24<ul>
25<li><a href= "#1.1">1.1 - What is OpenSSH and where can I download it?</a>
26<li><a href= "#1.2">1.2 - Why should it be used?</a>
27<li><a href= "#1.3">1.3 - What Operating Systems are supported?</a>
28<li><a href= "#1.4">1.4 - What about copyright, usage and patents?</a>
29<li><a href= "#1.5">1.5 - Where should I ask for help?</a>
30<li><a href= "#1.6">1.6 - I have found a bug. Where do I report it?</a>
31</ul>
32
33<h3><a href= "#2.0">2.0 - General Questions</a></h3>
34<ul>
35<li><a href= "#2.1">2.1 - Why does ssh/scp make connections from low-numbered ports. My firewall blocks these.</a>
36<li><a href= "#2.2">2.2 - Why is the ssh client setuid root?</a>
37<li><a href= "#2.3">2.3 - Why does SSH 2.3 have problems interoperating with OpenSSH 2.1.1?</a>
38<li><a href= "#2.4">2.4 - Why does OpenSSH print: Dispatch protocol error: type 20</a>
39<li><a href= "#2.5">2.5 - Old versions of commercial SSH encrypt host keys with IDEA.</a>
40<li><a href= "#2.6">2.6 - What are these warning messages about key lengths?</a>
41<li><a href= "#2.7">2.7 - X11 and/or agent forwarding does not work.</a>
42<li><a href= "#2.8">2.8 - After upgrading OpenSSH I lost SSH2 support.</a>
43<li><a href= "#2.9">2.9 - sftp/scp fails at connection, but ssh is OK.</a>
44<li><a href= "#2.10">2.10 - Will you add [foo] to scp?</a>
45<li><a href= "#2.11">2.11 - How do I use port forwarding?</a>
46<li><a href= "#2.12">2.12 - My ssh connection freezes or drops out after N minutes of inactivity.</a>
47<li><a href= "#2.13">2.13 - How do I use scp to copy a file with a colon in it?</a>
48<li><a href= "#2.14">2.14 - Why does OpenSSH report its version to clients?</a>
49</ul>
50
51<h3><a href= "#3.0">3.0 - Portable OpenSSH Questions</a></h3>
52<ul>
53<li><a href= "#3.1">3.1 - Spurious PAM authentication messages in logfiles.</a>
54<li><a href= "#3.2">3.2 - Empty passwords not allowed with PAM authentication.</a>
55<li><a href= "#3.3">3.3 - ssh(1) takes a long time to connect or log in</a>
56<li><a href= "#3.4">3.4 - "Can't locate module net-pf-10" messages in log under Linux.</a>
57<li><a href= "#3.5">3.5 - Password authentication doesn't work (eg on Slackware 7.0 or Red Hat Linux 6.x)</a>
58<li><a href= "#3.6">3.6 - Configure or sshd(8) complain about lack of RSA support</a>
59<li><a href= "#3.7">3.7 - "scp: command not found" errors</a>
60<li><a href= "#3.8">3.8 - Unable to read passphrase</a>
61<li><a href= "#3.9">3.9 - 'configure' missing or make fails</a>
62<li><a href= "#3.10">3.10 - Hangs when exiting ssh</a>
63<li><a href= "#3.11">3.11 - Why does ssh hang on exit?</a>
64<li><a href= "#3.12">3.12 - I upgraded to OpenSSH 3.1 and X11 forwarding stopped working.</a>
65<li><a href= "#3.13">3.13 - I upgraded to OpenSSH 3.8 and some X11 programs stopped working.</a>
66<li><a href= "#3.14">3.14 - I copied my public key to authorized_keys but public-key authentication still doesn't work.</a>
67<li><a href= "#3.15">3.15 - OpenSSH versions and PAM behaviour.</a>
68<li><a href= "#3.16">3.16 - Why doesn't "w" or "who" on AIX 5.x show users logged in via ssh?</a>
69</ul>
70
71</blockquote>
72
73<hr>
74
75<h2><u><a name= "1.0">1.0 - What Is OpenSSH and Where Can I Get It?</a></u></h2>
76
77<h2><a name= "1.1">1.1 - What is OpenSSH and where can I download it?</a></h2>
78
79OpenSSH provides end-to-end encrypted replacement of applications such as
80telnet, rlogin, and ftp.
81Unlike these legacy applications, OpenSSH never passes anything
82(including username and password) over the wire in unencrypted form, and
83provides host authentication, to verify that you really are talking to
84the system that you think you are and that no one else can take over
85that session.
86
87<p>
88The OpenSSH suite includes the
89<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a>
90program which replaces rlogin and telnet, and
91<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a>
92which replaces
93<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=rcp&amp;sektion=1">rcp(1)</a> and
94<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&amp;sektion=1">ftp(1)</a>.
95OpenSSH has also added
96<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&amp;sektion=1">sftp(1)</a> and
97<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&amp;sektion=8">sftp-server(8)</a>
98which implement an easier solution for file-transfer. This is based upon the
99<a href="http://www.openssh.com/txt/draft-ietf-secsh-filexfer-02.txt">secsh-filexfer</a> IETF draft.
100
101
102<p><strong>OpenSSH consists of a number of programs.</strong>
103
104<ul>
105<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a> - Server program run on the server machine. This listens for connections from client machines, and whenever it receives a connection, it performs authentication and starts serving the client.
106Its behaviour is controlled by the config file <i><a
107href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">
108sshd_config(5)</a></i>.
109<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a> - This is the client program used to log into another machine or to execute commands on the other machine. <i>slogin</i> is another name for this program.
110Its behaviour is controlled by the global config file <i><a
111href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh_config&amp;sektion=5">
112ssh_config(5)</a></i> and individual users' <i>$HOME/.ssh/config</i> files.
113<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a> - Securely copies files from one machine to another.
114<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a> - Used to create Pubkey Authentication (RSA or DSA) keys (host keys and user authentication keys).
115<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-agent&amp;sektion=1">ssh-agent(1)</a> - Authentication agent. This can be used to hold RSA keys for authentication.
116<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-add&amp;sektion=1">ssh-add(1)</a> - Used to register new keys with the agent.
117<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&amp;sektion=8">sftp-server(8)</a> - SFTP server subsystem.
118<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&amp;sektion=1">sftp(1)</a> - Secure file transfer program.
119<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keyscan&amp;sektion=1">ssh-keyscan(1)</a> - gather ssh public keys.
120<li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keysign&amp;sektion=8">ssh-keysign(8)</a> - ssh helper program for hostbased authentication.
121</ul>
122
123<h3>Downloading</h3>
124
125<p>
126The most recent version of OpenSSH is included with the current
127distribution of <a href="http://www.openbsd.org/">OpenBSD</a>, and
128installed as part of a basic install.
129
130<p>
131Today, most other operating systems include some version of OpenSSH
132(often re-badged or privately labeled), so most users can immediately
133use it.
134However, sometimes the included versions are quite old, and missing
135features of the current release of OpenSSH, and you may wish to install
136the current version, or install it on one of the few OSs that lacked it,
137and where the OS publisher does not make a modern version available.
138You may also wish to use OpenSSH on your embedded application.
139
140<p>
141Non-OpenBSD users will want to download, compile and install the
142multi-platform <a href="http://www.openssh.com/portable.html">Portable</a> distribution from a
143<a href="http://www.openssh.com/portable.html#mirrors">mirror</a> near you.
144
145
146<h2><a name= "1.2">1.2 - Why should it be used?</a></h2>
147
148<p>
149OpenSSH is a suite of tools to help secure your network
150connections. Here is a list of features:
151
152
153<ul>
154 <li>Strong authentication. Closes several security holes (e.g., IP, routing, and DNS spoofing).
155 <li>Improved privacy. All communications are automatically and transparently encrypted.
156 <li>Secure X11 sessions. The program automatically sets DISPLAY on the server machine, and forwards any X11 connections over the secure channel.
157 <li>Arbitrary TCP/IP ports can be redirected through the encrypted channel in both directions (e.g., for e-cash transactions).
158 <li>No retraining needed for normal users.
159 <li>Never trusts the network. Minimal trust on the remote side of the connection. Minimal trust on domain name servers. Pure RSA authentication never trusts anything but the private key.
160 <li>Client RSA-authenticates the server machine in the beginning of every connection to prevent trojan horses (by routing or DNS spoofing) and man-in-the-middle attacks, and the server RSA-authenticates the client machine before accepting <i>.rhosts</i> or <i>/etc/hosts.equiv</i> authentication (to prevent DNS, routing, or IP-spoofing).
161 <li>Host authentication key distribution can be centrally by the administration, automatically when the first connection is made to a machine.
162 <li>Any user can create any number of user authentication RSA keys for his/her own use.
163 <li>The server program has its own server RSA key which is automatically regenerated every hour.
164 <li>An authentication agent, running in the user's laptop or local workstation, can be used to hold the user's RSA authentication keys.
165 <li>The software can be installed and used (with restricted functionality) even without root privileges.
166 <li>The client is customizable in system-wide and per-user configuration files.
167 <li>Optional compression of all data with gzip (including forwarded X11 and TCP/IP port data), which may result in significant speedups on slow connections.
168 <li>Complete replacement for rlogin, rsh, and rcp.
169</ul>
170
171<p>
172Currently, almost all communications in computer networks are done
173without encryption. As a consequence, anyone who has access to any
174machine connected to the network can listen in on any communication.
175This is being done by hackers, curious administrators, employers,
176criminals, industrial spies, and governments. Some networks leak off
177enough electromagnetic radiation that data may be captured even from a
178distance.
179
180
181<p>
182When you log in, your password goes in the network in plain
183text. Thus, any listener can then use your account to do any evil he
184likes. Many incidents have been encountered worldwide where crackers
185have started programs on workstations without the owner's knowledge
186just to listen to the network and collect passwords. Programs for
187doing this are available on the Internet, or can be built by a
188competent programmer in a few hours.
189
190
191<p>
192Businesses have trade secrets, patent applications in preparation,
193pricing information, subcontractor information, client data, personnel
194data, financial information, etc. Currently, anyone with access to
195the network (any machine on the network) can listen to anything that
196goes in the network, without any regard to normal access restrictions.
197
198
199<p>
200Many companies are not aware that information can so easily be
201recovered from the network. They trust that their data is safe
202since nobody is supposed to know that there is sensitive information
203in the network, or because so much other data is transferred in the
204network. This is not a safe policy.
205
206
207<h2><a name= "1.3">1.3 - What operating systems are supported?</a></h2>
208
209<p>
210Even though OpenSSH is developed on
211<a href="http://www.openbsd.org/">OpenBSD</a> a wide variety of
212ports to other operating systems exist. The portable version of OpenSSH
213is headed by <a href="mailto:djm@openbsd.org">Damien Miller</a>.
214For a quick overview of the portable version of OpenSSH see
215<a href="http://www.openssh.com/portable.html">OpenSSH Portable Release</a>.
216Currently, the supported operating systems are:
217
218
219<ul>
220 <li>OpenBSD
221 <li>NetBSD
222 <li>FreeBSD
223 <li>AIX
224 <li>HP-UX
225 <li>IRIX
226 <li>Linux
227 <li>NeXT
228 <li>SCO
229 <li>SNI/Reliant Unix
230 <li>Solaris
231 <li>Digital Unix/Tru64/OSF
232 <li>Mac OS X
233 <li>Cygwin
234</ul>
235
236<p>
237A list of vendors that include OpenSSH in their distributions
238is located in the <a href="http://www.openssh.com/users.html">OpenSSH Users page</a>.
239
240<h2><a name= "1.4">1.4 - What about copyrights, usage and patents?</a></h2>
241<p>
242The OpenSSH developers have tried very hard to keep OpenSSH free of any
243patent or copyright problems. To do this, some options had to be
244stripped from OpenSSH. Namely support for patented algorithms.
245
246<p>
247OpenSSH does not support any patented transport algorithms. In SSH1 mode,
248only 3DES and Blowfish are available options. In SSH2 mode, only 3DES,
249Blowfish, CAST128, Arcfour and AES can be selected.
250The patented IDEA algorithm is not supported.
251
252<p>
253OpenSSH provides support for both SSH1 and SSH2 protocols.
254
255<p>
256Since the RSA patent has expired, there are no restrictions on the use
257of RSA algorithm using software, including OpenBSD.
258
259<h2><a name= "1.5">1.5 - Where should I ask for help?</a></h2>
260<p>
261There are many places to turn to for help. In addition to the main
262<a href="http://www.openssh.com/index.html">OpenSSH website</a>,
263there are many mailing lists to try. Before trying any mailing lists,
264please search through all mailing list archives to see if your question
265has already been answered. The OpenSSH Mailing List has been archived and
266put in searchable form and can be found at
267<a href="http://marc.info/?l=openssh-unix-dev&amp;r=1&amp;w=2">marc.info</a>.
268
269<p>
270For more information on subscribing to OpenSSH related mailing lists,
271please see <a href="http://www.openssh.com/list.html">OpenSSH Mailing lists</a>.
272
273<h2><a name= "1.6">1.6 - I have found a bug. Where do I report it?</a></h2>
274<p>
275Information about submitting bug reports can be found at the OpenSSH
276<a href="http://www.openssh.com/report.html">Reporting bugs</a> page.
277<p>
278If you wish to report a security bug, please contact the private developers
279list &lt;<a href="mailto:openssh@openssh.com">openssh@openssh.com</a>&gt;.
280
281<h2><u><a name= "2.0">2.0 - General Questions</a></u></h2>
282
283<h2><a name= "2.1">2.1 - Why does ssh/scp make connections from low-numbered ports.</a></h2>
284<p>
285The OpenSSH client uses low numbered ports for rhosts and rhosts-rsa
286authentication because the server needs to trust the username provided by
287the client. To get around this, you can add the below example to your
288<i>ssh_config</i> or <i>~/.ssh/config</i> file.
289
290
291<blockquote>
292<table border=0 width="800">
293 <tr>
294 <td nowrap bgcolor="#EEEEEE">
295<b>UsePrivilegedPort no</b>
296 </td>
297 </tr>
298</table>
299</blockquote>
300
301<p>
302Or you can specify this option on the command line, using the <b>-o</b>
303option to
304<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1">ssh(1)</a> command.
305
306<blockquote>
307<table border=0 width="800">
308 <tr>
309 <td nowrap bgcolor="#EEEEEE">
310$ <b>ssh -o "UsePrivilegedPort no" host.com</b>
311 </td>
312 </tr>
313</table>
314</blockquote>
315
316<h2><a name= "2.2">2.2 - Why is the ssh client setuid root?</a></h2>
317
318<p>
319In conjunction with the previous question, (<a href="#2.1">2.1</a>)
320OpenSSH needs root authority to be able to bind to low-numbered ports to
321facilitate <i>rhosts authentication</i>.
322A privileged port is also required for rhosts-rsa authentication to older
323SSH releases.
324
325<p>
326Additionally, for both <i>rhosts-rsa authentication</i> (in protocol
327version 1) and <i>hostbased authentication</i> (in protocol version 2)
328the ssh client needs to access the <i>private host key</i> in order to
329authenticate the client machine to the server.
330OpenSSH versions prior to 3.3 required the <code>ssh</code> binary to be
331setuid root to enable this, and you may safely remove it if you don't
332want to use these authentication methods.
333
334<p>
335Starting in OpenSSH 3.3, <code>ssh</code> is not setuid by default. <a
336href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keysign">ssh-keysign</a>,
337is used for access to the private hosts keys, and ssh does not use privileged
338source ports by default. If you wish to use a privileged source port, you must
339manually set the setuid bit on <code>ssh</code>.
340
341<h2><a name= "2.3">2.3 - Why does SSH 2.3 have problems interoperating with OpenSSH 2.1.1?</a></h2>
342
343<p>
344SSH 2.3 and earlier versions contain a flaw in their HMAC implementation.
345Their code was not supplying the full data block output from the digest,
346and instead always provided 128 bits. For longer digests, this caused
347SSH 2.3 to not interoperate with OpenSSH.
348
349<p>
350OpenSSH 2.2.0 detects that SSH 2.3 has this flaw. Recent versions of SSH
351will have this bug fixed. Or you can add the following to
352SSH 2.3 <i>sshd2_config</i>.
353
354
355<blockquote>
356<table border=0 width="800">
357 <tr>
358 <td nowrap bgcolor="#EEEEEE">
359<b>Mac hmac-md5</b>
360 </td>
361 </tr>
362</table>
363</blockquote>
364
365<h2><a name= "2.4">2.4 - Why does OpenSSH print: Dispatch protocol error: type 20</a></h2>
366
367<p>
368Problems in interoperation have been seen because older versions of
369OpenSSH did not support session rekeying. However the commercial SSH 2.3
370tries to negotiate this feature, and you might experience connection
371freezes or see the error message &quot;<b>Dispatch protocol error:
372type 20 </b>&quot;.
373To solve this problem, either upgrade to a recent OpenSSH release or
374disable rekeying by adding the following to your commercial SSH 2.3's
375<i>ssh2_config</i> or <i>sshd2_config</i>.
376
377
378<blockquote>
379<table border=0 width="800">
380 <tr>
381 <td nowrap bgcolor="#EEEEEE">
382<b>RekeyIntervalSeconds 0</b>
383 </td>
384 </tr>
385</table>
386</blockquote>
387
388<h2><a name= "2.5">2.5 - Old versions of commercial SSH encrypt host keys with IDEA.</a></h2>
389
390<p>
391The old versions of SSH used a patented algorithm to encrypt their
392<i>/etc/ssh/ssh_host_key</i>. This problem will manifest as
393<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>
394not being able to read its host key. To solve this, use the command below
395to convert your ssh_host_key to use 3DES.
396<b>NOTE:</b> Use the
397<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
398program from the Commercial SSH product, *NOT* OpenSSH for the example
399below.
400
401
402<blockquote>
403<table border=0 width="800">
404 <tr>
405 <td nowrap bgcolor="#EEEEEE">
406# <b>ssh-keygen -u -f /etc/ssh/ssh_host_key</b>
407 </td>
408 </tr>
409</table>
410</blockquote>
411
412<h2><a name= "2.6">2.6 - What are these warning messages about key lengths</a></h2>
413
414<p>
415Commercial SSH's
416<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&amp;sektion=1">ssh-keygen(1)</a>
417program contained a bug which caused it to occasionally generate Pubkey
418Authentication (RSA or DSA) keys which had their Most Significant Bit
419(MSB) unset. Such keys were advertised as being full-length, but are
420actually, half the time, smaller than advertised.
421
422<p>
423OpenSSH will print warning messages when it encounters such keys. To rid
424yourself of these message, edit your <i>known_hosts</i> files and replace the
425incorrect key length (usually "1024") with the correct key length
426(usually "1023").
427
428<h2><a name= "2.7">2.7 - X11 and/or agent forwarding does not work.</a></h2>
429
430<p>
431Check your <i>ssh_config</i> and <i>sshd_config</i>. The default
432configuration files disable authentication agent and X11 forwarding. To
433enable it, put the line below in <i>sshd_config</i>:
434
435<blockquote>
436<table border=0 width="800">
437 <tr>
438 <td nowrap bgcolor="#EEEEEE">
439<b>X11Forwarding yes</b>
440 </td>
441 </tr>
442</table>
443</blockquote>
444
445<p>
446and put the following lines in <i>ssh_config</i>:
447
448<blockquote>
449<table border=0 width="800">
450 <tr>
451 <td nowrap bgcolor="#EEEEEE">
452<b>ForwardAgent yes</b><br>
453<b>ForwardX11 yes</b>
454 </td>
455 </tr>
456</table>
457</blockquote>
458
459<p>
460X11 forwarding requires a working <a
461href="http://www.openbsd.org/cgi-bin/man.cgi?query=xauth&amp;sektion=1"
462>xauth(1)</a> binary. On OpenBSD this is in the <i>xbase</i> file
463set but will probably be different on other platforms. For OpenSSH
464Portable, xauth must be either found at configure time or specified
465via <b>XAuthLocation</b> in sshd_config(5) and ssh_config(5).
466
467<p>
468Note on agent interoperability: There are two different and
469incompatible agent forwarding mechanisms within the SSH2 protocol.
470OpenSSH has always used an extension of the original SSH1 agent
471requests, however some commercial products use a different, non-free
472agent forwarding protocol. This means that agent forwarding cannot
473be used between OpenSSH and those products.
474
475<p>
476<b>NOTE:</b> For users of Linux Mandrake 7.2, Mandrake modifies the
477<i>XAUTHORITY</i> environment variable in <i>/etc/skel/.bashrc</i>,
478and thus any bash user's home directory. This variable is set by OpenSSH
479and for either of the above options to work, you need to comment out
480the line:
481
482
483<blockquote>
484<table border=0 width="800">
485 <tr>
486 <td nowrap bgcolor="#EEEEEE">
487<b># export XAUTHORITY=$HOME/.Xauthority</b>
488 </td>
489 </tr>
490</table>
491</blockquote>
492
493<h2><a name= "2.8">2.8 - After upgrading OpenSSH I lost SSH2 support.</a></h2>
494
495<p>
496Between versions changes can be made to <i>sshd_config</i> or
497<i>ssh_config</i>. You should always check on these changes when upgrading
498versions of OpenSSH. After OpenSSH Version 2.3.0 you need to add the
499following to your <i>sshd_config</i>:
500
501
502<blockquote>
503<table border=0 width="800">
504 <tr>
505 <td nowrap bgcolor="#EEEEEE">
506<b>HostKey /etc/ssh_host_dsa_key</b><br>
507<b>HostKey /etc/ssh_host_rsa_key</b>
508 </td>
509 </tr>
510</table>
511</blockquote>
512
513<h2><a name= "2.9">2.9 - sftp/scp fails at connection, but ssh is OK.</a></h2>
514
515<p>
516sftp and/or scp may fail at connection time if you have shell
517initialization (.profile, .bashrc, .cshrc, etc) which produces output
518for non-interactive sessions. This output confuses the sftp/scp client.
519You can verify if your shell is doing this by executing:
520
521<blockquote>
522<table border=0 width="800">
523 <tr>
524 <td nowrap bgcolor="#EEEEEE">
525<b>ssh yourhost /usr/bin/true</b>
526 </td>
527 </tr>
528</table>
529</blockquote>
530
531<p>
532If the above command produces any output, then you need to modify your
533shell initialization.
534
535<h2><a name= "2.10">2.10 - Will you add [foo] to scp?</a></h2>
536
537<p>
538Short Answer: no.
539
540<p>
541Long Answer: scp is not standardized. The closest thing it has to a
542specification is "what rcp does". Since the same command is used on both ends
543of the connection, adding features or options risks breaking interoperability with other
544implementations.
545
546<p>
547New features are more likely in sftp, since the protocol is standardized
548(well, a <a href="http://www.ietf.org/html.charters/OLD/secsh-charter.html">
549draft standard</a>), extensible, and the client and server are decoupled.
550
551<h2><a name= "2.11">2.11 - How do I use port forwarding?</a></h2>
552
553<p>
554If the remote server is running sshd(8), it may be possible to
555``tunnel'' certain services via ssh. This may be desirable, for
556example, to encrypt POP or SMTP connections, even though the software
557does not directly support encrypted communications. Tunnelling uses
558port forwarding to create a connection between the client and server.
559The client software must be able to specify a non-standard port to
560connect to for this to work.
561
562<p>
563The idea is that the user connects to the remote host using ssh,
564and specifies which port on the client's machine should be used to
565forward connections to the remote server. After that it is possible
566to start the service which is to be encrypted (e.g. fetchmail, irc)
567on the client machine, specifying the same local port passed to
568ssh, and the connection will be tunnelled through ssh. By default,
569the system running the forward will only accept connections from
570itself.
571
572<p>
573The options most relevant to tunnelling are the -L and -R options,
574which allow the user to forward connections, the -D option, which
575permits dynamic port forwarding, the -g option, which permits other
576hosts to use port forwards, and the -f option, which instructs ssh
577to put itself in the background after authentication. See the <a
578href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&amp;sektion=1"
579>ssh(1)</a> man page for further details.
580
581<p>
582This is an example of tunnelling an IRC session from client machine
583``127.0.0.1'' (localhost) to remote server ``server.example.com'':
584
585<blockquote>
586<table border=0 width="800">
587 <tr>
588 <td nowrap bgcolor="#EEEEEE">
589<b>ssh -f -L 1234:server.example.com:6667 server.example.com sleep 10<br>
590irc -c '#users' -p 1234 pinky 127.0.0.1</b>
591 </td>
592 </tr>
593</table>
594</blockquote>
595
596<p>
597This tunnels a connection to IRC server server.example.com, joining
598channel ``#users'', using the nickname ``pinky''. The local port used
599in this example is 1234. It does not matter which port is used, as
600long as it's greater than 1023 (remember, only root can open sockets on
601privileged ports) and doesn't conflict with any ports already in use.
602The connection is forwarded to port 6667 on the remote server, since
603that's the standard port for IRC services.
604
605<p>
606The remote command ``sleep 10'' was specified to allow an amount
607of time (10 seconds, in the example) to start the service which is to
608be tunnelled. If no connections are made within the time specified,
609ssh will exit. If more time is required, the sleep(1) value can be
610increased appropriately or, alternatively, the example above could
611be added as a function to the user's shell. See ksh(1) and csh(1)
612for more details about user-defined functions.
613
614<p>
615ssh also has an -N option, convenient for use with port forwarding:
616if -N is specified, it is not necessary to specify a remote command
617(``sleep 10'' in the example above). However, use of this option
618causes ssh to wait around for ever (as opposed to exiting after a
619remote command has completed), and the user must take care to manually
620kill(1) the process afterwards.
621
622<h2><a name= "2.12">2.12 - My ssh connection freezes or drops out after N minutes of inactivity.</a></h2>
623
624<p>
625This is usually the result of a packet filter or NAT device
626timing out your TCP connection due to inactivity. You can enable
627<b>ClientAliveInterval</b> in the server's <i><a
628href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&amp;sektion=5">
629sshd_config</a></i>, or enable <b>ServerAliveInterval</b> in the
630client's <i><a
631href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh_config&amp;sektion=5">
632ssh_config</a></i> (the latter is available in OpenSSH 3.8 and newer).
633
634<p>
635Enabling either option and setting the interval for less than the time
636it takes to time out your session will ensure that the connection is
637kept "fresh" in the device's connection table.
638
639<h2><a name= "2.13">2.13 - How do I use scp to copy a file with a colon in it?</a></h2>
640
641<b><a
642href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">
643scp</a></b> will interpret the component before the colon to be a remote
644server name and attempt to connect to it. To prevent this, refer to
645the file by a relative or absolute path, eg:
646
647<blockquote>
648<table border=0 width="800">
649 <tr>
650 <td nowrap bgcolor="#EEEEEE">
651$ scp ./source:file sshserver:
652 </td>
653 </tr>
654</table>
655</blockquote>
656
657<h2><a name= "2.14">2.14 - Why does OpenSSH report its version to clients?</a></h2>
658
659<p>
660OpenSSH, like most SSH implementations, reports its name and version to clients
661when they connect, e.g.
662</p>
663
664<blockquote>
665SSH-2.0-OpenSSH_3.9
666</blockquote>
667
668<p>
669This information is used by clients and servers to enable protocol
670compatibility tweaks to work around changed, buggy or missing features in
671the implementation they are talking to. This protocol feature checking is
672still required at present because versions with incompatibilities are still
673in wide use.
674</p>
675
676<h2><u><a name= "3.0">3.0 - Portable OpenSSH Questions</a></u></h2>
677
678<h2><a name= "3.1">3.1 - Spurious PAM authentication messages in logfiles.</a></h2>
679
680<p>
681The portable version of OpenSSH will generate spurious authentication
682failures at every login, similar to:
683
684
685<blockquote>
686<table border=0 width="800">
687 <tr>
688 <td nowrap bgcolor="#EEEEEE">
689&quot;<b>authentication failure; (uid=0) -&gt; root for sshd service</b>&quot;
690 </td>
691 </tr>
692</table>
693</blockquote>
694
695<p>
696These are generated because OpenSSH first tries to determine whether a
697user needs authentication to login (e.g. empty password). Unfortunately
698PAM likes to log all authentication events, this one included.
699
700<p>
701If it annoys you too much, set &quot;<b>PermitEmptyPasswords no</b>&quot;
702in <i>sshd_config</i>. This will quiet the error message at the expense
703of disabling logins to accounts with no password set.
704This is the default if you use the supplied <i>sshd_config</i> file.
705
706<h2><a name= "3.2">3.2 - Empty passwords not allowed with PAM authentication.</a></h2>
707
708<p>
709To enable empty passwords with a version of OpenSSH built with PAM you
710must add the flag nullok to the end of the password checking module
711in the <i>/etc/pam.d/sshd</i> file. For example:
712
713<blockquote>
714<table border=0 width="800">
715 <tr>
716 <td nowrap bgcolor="#EEEEEE">
717auth required/lib/security/pam_unix.so shadow nodelay nullok
718 </td>
719 </tr>
720</table>
721</blockquote>
722
723<p>
724This must be done in addition to setting &quot;<b>PermitEmptyPasswords
725yes</b>&quot; in the <i>sshd_config</i> file.
726
727<p>
728There is one caveat when using empty passwords with PAM authentication:
729PAM will allow any password when authenticating an account with an empty
730password. This breaks the check that
731<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&amp;sektion=8">sshd(8)</a>
732uses to determine whether an account has no password set and grant
733users access to the account regardless of the policy specified by
734<b>PermitEmptyPasswords</b>. For this reason, it is recommended that you
735do not add the <b>nullok</b> directive to your PAM configuration file
736unless you specifically wish to allow empty passwords.
737
738
739<h2><a name= "3.3">3.3 - ssh(1) takes a long time to connect or log
740in</a></h2>
741
742<p>
743Large delays (more than 10 seconds) are typically caused by a problem with
744name resolution:
745<ul>
746<li>Some versions of glibc (notably glibc 2.1 shipped with Red Hat 6.1)
747can take a long time to resolve "IPv6 or IPv4" addresses from domain
748names. This can be worked around with by specifying <b>AddressFamily
749inet</b> option in <i>ssh_config</i>.</li>
750
751<li>There may be a DNS lookup problem, either at the client or server.
752You can use the <code>nslookup</code> command to check this on both client
753and server by looking up the other end's name and IP address. In
754addition, on the server look up the name returned by the client's
755IP-name lookup. You can disable most of the server-side lookups by
756setting <b>UseDNS no</b> in <i>sshd_config</i>.</li>
757</ul>
758
759<p>
760Delays less than 10 seconds can have other causes.
761
762<ul>
763
764<li>OpenSSH releases prior to 3.8 had an <i>moduli</i> file with
765moduli that were just smaller than what sshd would look for, and
766as a result, sshd would end up using moduli significantly larger
767than requested, which resulted in a speed penalty. Replacing the
768<i>moduli</i> file will resolve this (note that in most cases this
769file will not be replaced during an upgrade and must be replaced
770manually).</li>
771
772<li>OpenSSH releases prior to 3.8 had a flaw in <code>ssh</code> that
773would cause it to request moduli larger than intended (which when
774combined with the above resulted in significant slowdowns).
775Upgrading the client to 3.8 or higher will resolve this issue.</li>
776
777<li>If either the client or server lack a kernel-based random number
778device (eg Solaris &lt; 9, AIX &lt; 5.2, HP-UX &lt; 11.11) and no
779substitute is available (eg <a href=
780"ftp://ftp.ayamura.org/pub/prngd/">prngd</a>) it's possible that
781one of the programs called by <code>ssh-rand-helper</code> to
782generate entropy is hanging. This can be investigated by running
783it in debug mode:
784
785<blockquote>
786<table border=0 width="800">
787 <tr>
788 <td nowrap bgcolor="#EEEEEE">
789/usr/local/libexec/ssh-rand-helper -vvv
790 </td>
791 </tr>
792</table>
793</blockquote>
794
795Any significant delays should be investigated and rectified, or the
796corresponding commands should be removed from <i>ssh_prng_cmds</i>.
797</li>
798
799</ul>
800
801<h3>How slow is "slow"?</h3>
802Under normal conditions, the speed of SSH logins is dependant on
803CPU speed of client and server. For comparison the following are
804typical connect times for <code>time ssh localhost true</code>
805with a 1024-bit RSA key on otherwise unloaded hosts. OpenSSH and
806OpenSSL were compiled with gcc 3.3.x.
807
808<p>
809<table>
810<tr><th>CPU</th><th>Time (SSHv1)<a href="#3.3fn1">[1]</a></th>
811 <th>Time (SSHv2)</th></tr>
812<tr><td>170MHz SPARC/sun4m</td><td>0.74 sec</td><td>1.25 sec</td></tr>
813<tr><td>236MHz HPPA/8200<a href="#3.3fn2">[2]</a></td><td>0.44 sec</td>
814 <td>0.79 sec</td></tr>
815<tr><td>375MHz PowerPC/604e</td><td>0.38 sec</td><td>0.51 sec</td></tr>
816<tr><td>933MHz VIA Ezra</td><td>0.34 sec</td><td>0.44 sec</td></tr>
817<tr><td>2.1GHz Athlon XP 2600+</td><td>0.14 sec</td><td>0.22 sec</td></tr>
818</table>
819
820<br>
821
822<a name="3.3fn1">[1]</a> The SSHv1 protocol is faster but is
823cryptographically weaker than SSHv2.<br>
824
825<a name="3.3fn2">[2]</a> At the time of writing, gcc generates
826relatively slow code on HPPA for RSA and Diffie-Hellman operations
827(see <a href= "http://gcc.gnu.org/bugzilla/show_bug.cgi?id=7625">gcc
828bug #7625</a> and <a
829href="http://marc.info/?l=openssh-unix-dev&amp;m=102646106016694">
830discussion on openssh-unix-dev</a>).
831
832<h2><a name= "3.4">3.4 - "Can't locate module net-pf-10" messages in log under Linux.</a></h2>
833
834<p>
835The Linux kernel is looking (via modprobe) for protocol family 10 (IPv6).
836Either load the appropriate kernel module, enter the correct alias in
837<i>/etc/modules.conf</i> or disable IPv6 in <i>/etc/modules.conf</i>.
838
839
840<p>
841For some silly reason <i>/etc/modules.conf</i> may also be named
842<i>/etc/conf.modules</i>.
843
844
845<h2><a name= "3.5">3.5 - Password authentication doesn't work (eg on Slackware 7.0 or Red Hat 6.x)</a></h2>
846
847<p>
848If the password is correct password the login is still denied, the
849usual cause is that the system is configured to use MD5-type passwords
850but the
851<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=crypt&amp;sektion=3"
852>crypt(3)</a> function used by sshd doesn't understand them.
853
854<p>
855Affected accounts will have password strings in <i>/etc/passwd</i>
856or <i>/etc/shadow</i> that start with <b>$1$</b>.
857If password authentication fails for new accounts or accounts with
858recently changed passwords, but works for old accounts, this is the
859likely culprit.
860
861<p>
862The underlying cause is that some versions of OpenSSL have a crypt(3)
863function that does not understand MD5 passwords, and the link order of
864sshd means that OpenSSL's crypt(3) is used instead of the system's.
865OpensSSH's configure attempts to correct for this but is not always
866successful.
867
868<p>
869There are several possible solutions:
870
871<ul>
872<li>
873<p>
874Enable sshd's built-in support for MD5 passwords at build time.
875
876<blockquote>
877<table border=0 width="800">
878 <tr>
879 <td nowrap bgcolor="#EEEEEE">
880./configure --with-md5-passwords [options]
881 </td>
882 </tr>
883</table>
884</blockquote>
885
886This is safe even if you have both types of encryption as sshd will
887select the correct algorithm for each account automatically.
888
889<li>
890<p>
891If your system has a separate libcrypt library (eg Slackware 7) then you
892can manually add -lcrypt to the LIBS list so it's used instead of
893OpenSSL's:
894
895<blockquote>
896<table border=0 width="800">
897 <tr>
898 <td nowrap bgcolor="#EEEEEE">
899LIBS=-lcrypt ./configure [options]
900 </td>
901 </tr>
902</table>
903</blockquote>
904
905<li>
906<p>
907If your platforms supports PAM, you may configure sshd to use it
908(see <a href= "#3.15" >section 3.15</a>). This will mean that sshd will
909not verify passwords itself but will defer to the configured PAM modules.
910</ul>
911
912<h2><a name= "3.6">3.6 - Configure or sshd(8) complain about lack of RSA or DSA support</a></h2>
913
914<p>
915Ensure that your OpenSSL libraries have been built to include RSA or DSA
916support either internally or through RSAref.
917
918
919<h2><a name= "3.7">3.7 - "scp: command not found" errors</a></h2>
920
921<p>
922<a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&amp;sektion=1">scp(1)</a>
923must be in the default PATH on both the client and the server. You may
924need to use the <b>--with-default-path</b> option to specify a custom
925path to search on the server. This option replaces the default path,
926so you need to specify all the current directories on your path as well
927as where you have installed scp. For example:
928
929<blockquote>
930<table border=0 width="800">
931 <tr>
932 <td nowrap bgcolor="#EEEEEE">
933$ <b>./configure --with-default-path=/bin:/usr/bin:/usr/local/bin:/path/to/scp</b>
934 </td>
935 </tr>
936</table>
937</blockquote>
938
939<p>
940Note that configuration by the server's admin will take precedence over the
941setting of <b>--with-default-path</b>. This includes resetting PATH in
942<i>/etc/profile</i>, PATH in <i>/etc/environment</i> on AIX, or (for 3.7p1 and
943above) setting PATH or SUPATH in <i>/etc/default/login</i> on Solaris or
944Reliant Unix.
945
946<h2><a name= "3.8">3.8 - Unable to read passphrase</a></h2>
947
948<p>
949Some operating systems set <i>/dev/tty</i> with incorrect modes, causing
950the reading of passwords to fail with the following error:
951
952<blockquote>
953<table border=0 width="800">
954 <tr>
955 <td nowrap bgcolor="#EEEEEE">
956You have no controlling tty. Cannot read passphrase.
957 </td>
958 </tr>
959</table>
960</blockquote>
961
962<p>
963The solution to this is to reset the permissions on <i>/dev/tty</i>
964to mode 0666 and report the error as a bug to your OS vendor.
965
966
967<h2><a name= "3.9">3.9 - 'configure' missing or make fails</a></h2>
968
969<p>
970If there is no 'configure' file in the tar.gz file that you downloaded
971or make fails with "missing separator" errors, you have probably
972downloaded the OpenBSD distribution of OpenSSH and are attempting to
973compile it on another platform. Please refer to the information on the
974<a href="http://www.openssh.com/portable.html">portable version</a>.
975
976
977<h2><a name= "3.10">3.10 - Hangs when exiting ssh</a></h2>
978
979<p>
980OpenSSH may hang when exiting. This can occur when there is an active
981background process. This is known to occur on Linux and HP-UX.
982The problem can be verified by doing the following:
983
984<blockquote>
985<table border=0 width="800">
986 <tr>
987 <td nowrap bgcolor="#EEEEEE">
988$ <b>sleep 20 &amp; exit</b>
989 </td>
990 </tr>
991</table>
992</blockquote>
993
994Try to use this instead:
995<blockquote>
996<table border=0 width="800">
997 <tr>
998 <td nowrap bgcolor="#EEEEEE">
999$ <b>sleep 20 &lt; /dev/null &gt; /dev/null 2&gt;&amp;1 &amp;</b>
1000 </td>
1001 </tr>
1002</table>
1003</blockquote>
1004
1005<p>
1006A work around for bash users is to place <b>"shopt -s huponexit"</b>
1007in either /etc/bashrc or ~/.bashrc. Otherwise, consult your shell's
1008man page for an option to enable it to send a HUP signal to active
1009jobs when exiting. See <a
1010href="http://bugzilla.mindrot.org/show_bug.cgi?id=52">bug #52</a>
1011for other workarounds.
1012
1013<h2><a name= "3.11">3.11 - Why does ssh hang on exit?</a></h2>
1014
1015<p>
1016When executing
1017<blockquote>
1018<table border=0 width="800">
1019 <tr>
1020 <td nowrap bgcolor="#EEEEEE">
1021$ <b>ssh host command</b>
1022 </td>
1023 </tr>
1024</table>
1025</blockquote>
1026ssh <b>needs</b> to hang, because it needs to wait:
1027<ul>
1028<li>
1029until it can be sure that <code>command</code> does not need
1030more input.
1031<li>
1032until it can be sure that <code>command</code> does not produce
1033more output.
1034<li>
1035until <code>command</code> exits because sshd needs to tell
1036the exit status from <code>command</code> to ssh.
1037</ul>
1038<p>
1039
1040<h2><a name= "3.12">3.12 - I upgraded to OpenSSH 3.1 and X11
1041forwarding stopped working.</a></h2>
1042
1043Starting with OpenSSH 3.1, the sshd x11 forwarding server listens on
1044localhost by default; see the sshd <b>X11UseLocalhost</b> option to
1045revert to prior behaviour if your older X11 clients do not function
1046with this configuration.<p>
1047
1048In general, X11 clients using X11 R6 should work with the default
1049setting. Some vendors, including HP, ship X11 clients with R6
1050and R5 libs, so some clients will work, and others will not work.
1051This is true for HP-UX 11.X.<p>
1052
1053<h2><a name= "3.13">3.13 - I upgraded to OpenSSH 3.8 and some
1054X11 programs stopped working.</a></h2>
1055
1056<p>
1057As documented in the <a href="http://www.openssh.com/txt/release-3.8">3.8 release notes</a>,
1058<code>ssh</code> will now use untrusted X11 cookies by
1059default. The previous behaviour can be restored by setting
1060<b>ForwardX11Trusted yes</b> in <i>ssh_config</i>.
1061
1062<p>
1063Possible symptoms include:<br>
1064<code>BadWindow (invalid Window parameter)<br>
1065BadAccess (attempt to access private resource denied)<br>
1066X Error of failed request: BadAtom (invalid Atom parameter)<br>
1067Major opcode of failed request: 20 (X_GetProperty)<br></code>
1068
1069<h2><a name= "3.14">3.14 - I copied my public key to authorized_keys
1070but public-key authentication still doesn't work.</a></h2>
1071
1072<p>
1073Typically this is caused by the file permissions on $HOME, $HOME/.ssh or
1074$HOME/.ssh/authorized_keys being more permissive than sshd allows by default.
1075
1076<p>
1077In this case, it can be solved by executing the following on the server.
1078<blockquote>
1079<table border=0 width="800">
1080<tr>
1081 <td nowrap bgcolor="#EEEEEE">
1082$ <b>chmod go-w $HOME $HOME/.ssh</b><br>
1083$ <b>chmod 600 $HOME/.ssh/authorized_keys</b><br>
1084$ <b>chown `whoami` $HOME/.ssh/authorized_keys</b><br>
1085 </td>
1086</tr>
1087</table>
1088</blockquote>
1089
1090<p>
1091If this is not possible for some reason, an alternative is to set
1092<b>StrictModes no</b> in <i>sshd_config</i>, however this is not
1093recommended.
1094
1095<h2><a name= "3.15">3.15 - OpenSSH versions and PAM behaviour.</a></h2>
1096
1097Portable OpenSSH has a configure-time option to enable sshd's use of the
1098<a href="http://www.opengroup.org/onlinepubs/008329799/">PAM</a>
1099(Pluggable Authentication Modules) interface.
1100
1101<blockquote>
1102<table border=0 width="800">
1103 <tr>
1104 <td nowrap bgcolor="#EEEEEE">
1105./configure --with-pam [options]
1106 </td>
1107 </tr>
1108</table>
1109</blockquote>
1110
1111To use PAM at all, this option must be provided at build time.
1112The run-time behaviour when PAM is built in varies with the version of
1113Portable OpenSSH, and on later versions it must also be enabled by setting
1114<b>UsePAM</b> to <b>yes</b> in <i>sshd_config</i>.
1115
1116<p>
1117The behaviour of the relevant authentications options when PAM support is built
1118in is summarised by the following table.
1119
1120<p>
1121<table border="1">
1122 <tr> <th>Version</th> <th>UsePAM</th> <th>PasswordAuthentication</th> <th>ChallengeResponseAuthentication</th> </tr>
1123 <tr>
1124 <td>&lt;=3.6.1p2</td>
1125 <td>Not applicable</td>
1126 <td>Uses PAM</td>
1127 <td>Uses PAM if <b>PAMAuthenticationViaKbdInt</b> is enabled</td>
1128 </tr>
1129 <tr>
1130 <td>3.7p1 - 3.7.1p1</td>
1131 <td>Defaults to <b>yes</b></td>
1132 <td>Does not use PAM</td>
1133 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1134 </tr>
1135 <tr>
1136 <td>3.7.1p2 - 3.8.1p1</td>
1137 <td>Defaults to <b>no</b></td>
1138 <td>Does not use PAM <a href="#3.15fn1">[1]</a></td>
1139 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1140 </tr>
1141 <tr>
1142 <td>3.9p1</td>
1143 <td>Defaults to <b>no</b></td>
1144 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1145 <td>Uses PAM if <b>UsePAM</b> is enabled</td>
1146 </tr>
1147</table>
1148<p>
1149
1150<a name= "3.15fn1">[1]</a> Some vendors, notably Redhat/Fedora, have
1151backported the PasswordAuthentication from 3.9p1 to their 3.8x based
1152packages. If you're using a vendor-supplied package then consult their
1153documentation.
1154
1155<p>
1156OpenSSH Portable's PAM interface still has problems with a few modules,
1157however we hope that this number will reduce in the future. As at the
11583.9p1 release, the known problems are:
1159
1160<ul>
1161 <li>Modules relying on module-private data (eg pam_dhkeys, pam_krb5, AFS)
1162 may fail to correctly establish credentials (bug <a
1163 href="http://bugzilla.mindrot.org/show_bug.cgi?id=688">#688</a>) when
1164 authenticating via <b>ChallengeResponseAuthentication</b>.
1165 <b>PasswordAuthentication</b> with 3.9p1 and above should work.
1166</ul>
1167
1168You can also check <a
1169href="http://bugzilla.mindrot.org/buglist.cgi?product=Portable+OpenSSH&amp;bug_status=RESOLVED&amp;bug_status=NEW&amp;bug_status=ACCEPTED&amp;component=PAM+support"
1170>bugzilla for current PAM issues</a>.
1171
1172<h2><a name= "3.16">3.16 - Why doesn't "w" or "who" on AIX 5.x show users
1173logged in via ssh?</a></h2>
1174
1175Between AIX 4.3.3 and AIX 5.x, the format of the wtmp struct changed. This
1176means that sshd binaries built on AIX 4.x will not correctly write wtmp
1177entries when run on AIX 5.x. This can be fixed by simply recompiling
1178sshd on an AIX 5.x system and using that.
1179
1180<hr>
1181<a href="http://www.openssh.com/index.html"><img height=24 width=24 src="back.gif" border=0 alt=OpenSSH></a>
1182<a href="mailto:www@openbsd.org">www@openbsd.org</a>
1183<br>
1184<small>$OpenBSD: faq.html,v 1.113 2012/04/21 12:12:22 dtucker Exp $</small>
1185
1186</body>
1187</html>
diff --git a/debian/gnome-ssh-askpass.1 b/debian/gnome-ssh-askpass.1
new file mode 100644
index 000000000..b74c410a8
--- /dev/null
+++ b/debian/gnome-ssh-askpass.1
@@ -0,0 +1,51 @@
1.TH GNOME-SSH-ASKPASS 1
2.SH NAME
3gnome\-ssh\-askpass \- prompts a user for a passphrase using GNOME
4.SH SYNOPSIS
5.B gnome\-ssh\-askpass
6.SH DESCRIPTION
7.B gnome\-ssh\-askpass
8is a GNOME-based passphrase dialog for use with OpenSSH.
9It is intended to be called by the
10.BR ssh\-add (1)
11program and not invoked directly.
12It allows
13.BR ssh\-add (1)
14to obtain a passphrase from a user, even if not connected to a terminal
15(assuming that an X display is available).
16This happens automatically in the case where
17.B ssh\-add
18is invoked from one's
19.B ~/.xsession
20or as one of the GNOME startup programs, for example.
21.PP
22In order to be called automatically by
23.BR ssh\-add ,
24.B gnome\-ssh\-askpass
25should be installed as
26.IR /usr/bin/ssh\-askpass .
27.SH "ENVIRONMENT VARIABLES"
28The following environment variables are recognized:
29.TP
30.I GNOME_SSH_ASKPASS_GRAB_SERVER
31Causes
32.B gnome\-ssh\-askpass
33to grab the X server before asking for a passphrase.
34.TP
35.I GNOME_SSH_ASKPASS_GRAB_POINTER
36Causes
37.B gnome\-ssh\-askpass
38to grab the mouse pointer using
39.IR gdk_pointer_grab ()
40before asking for a passphrase.
41.PP
42Regardless of whether either of these environment variables is set,
43.B gnome\-ssh\-askpass
44will grab the keyboard using
45.IR gdk_keyboard_grab ().
46.SH AUTHOR
47This manual page was written by Colin Watson <cjwatson@debian.org>
48for the Debian system (but may be used by others).
49It was based on that for
50.B x11\-ssh\-askpass
51by Philip Hands.
diff --git a/debian/keygen-test/Makefile b/debian/keygen-test/Makefile
new file mode 100644
index 000000000..666ed8227
--- /dev/null
+++ b/debian/keygen-test/Makefile
@@ -0,0 +1,12 @@
1test: getpid.so
2 chmod +x keygen-test
3 ./keygen-test
4
5getpid.o: getpid.c
6 gcc -fPIC -c $< -o $@
7
8getpid.so: getpid.o
9 gcc -shared -o $@ $<
10
11clean:
12 rm -f getpid.o getpid.so key1 key1.pub key2 key2.pub
diff --git a/debian/keygen-test/getpid.c b/debian/keygen-test/getpid.c
new file mode 100644
index 000000000..c9e35b87e
--- /dev/null
+++ b/debian/keygen-test/getpid.c
@@ -0,0 +1,39 @@
1/*
2 * Compile:
3
4gcc -fPIC -c getpid.c -o getpid.o
5gcc -shared -o getpid.so getpid.o
6
7 * Use:
8
9FORCE_PID=1234 LD_PRELOAD=./getpid.so bash
10
11#
12# Copyright (C) 2001-2008 Kees Cook
13# kees@outflux.net, http://outflux.net/
14#
15# This program is free software; you can redistribute it and/or
16# modify it under the terms of the GNU General Public License
17# as published by the Free Software Foundation; either version 2
18# of the License, or (at your option) any later version.
19#
20# This program is distributed in the hope that it will be useful,
21# but WITHOUT ANY WARRANTY; without even the implied warranty of
22# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
23# GNU General Public License for more details.
24#
25# You should have received a copy of the GNU General Public License
26# along with this program; if not, write to the Free Software
27# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
28# http://www.gnu.org/copyleft/gpl.html
29
30*/
31
32#include <sys/types.h>
33#include <unistd.h>
34#include <stdlib.h>
35
36pid_t getpid(void)
37{
38 return atoi(getenv("FORCE_PID"));
39}
diff --git a/debian/keygen-test/keygen-test b/debian/keygen-test/keygen-test
new file mode 100755
index 000000000..2abe815ef
--- /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..24376514f
--- /dev/null
+++ b/debian/openssh-client.install
@@ -0,0 +1,34 @@
1#! /usr/bin/dh-exec
2
3etc/ssh/ssh_config
4usr/bin/scp
5usr/bin/sftp
6usr/bin/ssh
7usr/bin/ssh-add
8usr/bin/ssh-agent
9usr/bin/ssh-keygen
10usr/bin/ssh-keyscan
11usr/lib/openssh/ssh-keysign
12usr/lib/openssh/ssh-pkcs11-helper
13usr/share/man/man1/scp.1
14usr/share/man/man1/sftp.1
15usr/share/man/man1/ssh-add.1
16usr/share/man/man1/ssh-agent.1
17usr/share/man/man1/ssh-keygen.1
18usr/share/man/man1/ssh-keyscan.1
19usr/share/man/man1/ssh.1
20usr/share/man/man5/ssh_config.5
21usr/share/man/man8/ssh-keysign.8
22usr/share/man/man8/ssh-pkcs11-helper.8
23
24contrib/ssh-copy-id usr/bin
25debian/ssh-argv0 usr/bin
26
27debian/agent-launch usr/lib/openssh
28
29# dh_apport would be neater, but at the time of writing it isn't in unstable
30# yet.
31debian/openssh-client.apport => usr/share/apport/package-hooks/openssh-client.py
32
33# systemd user unit (only used under sessions)
34debian/systemd/ssh-agent.service usr/lib/systemd/user
diff --git a/debian/openssh-client.links b/debian/openssh-client.links
new file mode 100644
index 000000000..1d94c74e8
--- /dev/null
+++ b/debian/openssh-client.links
@@ -0,0 +1,4 @@
1usr/bin/ssh usr/bin/slogin
2usr/share/man/man1/ssh.1 usr/share/man/man1/slogin.1
3# enable systemd user unit for graphical sessions that use systemd
4usr/lib/systemd/user/ssh-agent.service usr/lib/systemd/user/graphical-session-pre.target.wants/ssh-agent.service
diff --git a/debian/openssh-client.lintian-overrides b/debian/openssh-client.lintian-overrides
new file mode 100644
index 000000000..486567744
--- /dev/null
+++ b/debian/openssh-client.lintian-overrides
@@ -0,0 +1 @@
openssh-client: setuid-binary usr/lib/openssh/ssh-keysign 4755 root/root
diff --git a/debian/openssh-client.maintscript b/debian/openssh-client.maintscript
new file mode 100644
index 000000000..e39db9ac5
--- /dev/null
+++ b/debian/openssh-client.maintscript
@@ -0,0 +1 @@
rm_conffile /etc/ssh/moduli 1:7.9p1-8~
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..12fb3671d
--- /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 [ ! -d /etc/ssh ] || 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..e730fc43d
--- /dev/null
+++ b/debian/openssh-server-udeb.dirs
@@ -0,0 +1 @@
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..4a66a35e9
--- /dev/null
+++ b/debian/openssh-server.config
@@ -0,0 +1,46 @@
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
19permit_root_login="$(get_config_option PermitRootLogin)" || true
20password_authentication="$(get_config_option PasswordAuthentication)" || true
21if [ -f /etc/ssh/sshd_config ]; then
22 # Make sure the debconf database is in sync with the current state
23 # of the system.
24 if [ "$permit_root_login" = yes ]; then
25 db_set openssh-server/permit-root-login false
26 else
27 db_set openssh-server/permit-root-login true
28 fi
29 if [ "$password_authentication" = no ]; then
30 db_set openssh-server/password-authentication false
31 else
32 db_set openssh-server/password-authentication true
33 fi
34fi
35
36if dpkg --compare-versions "$2" lt-nl 1:6.6p1-1 && \
37 [ "$permit_root_login" = yes ]; then
38 if [ "$(getent shadow root | cut -d: -f2)" = "!" ]; then
39 db_set openssh-server/permit-root-login true
40 else
41 db_input high openssh-server/permit-root-login || true
42 db_go
43 fi
44fi
45
46exit 0
diff --git a/debian/openssh-server.examples b/debian/openssh-server.examples
new file mode 100644
index 000000000..9f15e1fa7
--- /dev/null
+++ b/debian/openssh-server.examples
@@ -0,0 +1 @@
debian/systemd/ssh-session-cleanup.service
diff --git a/debian/openssh-server.install b/debian/openssh-server.install
new file mode 100755
index 000000000..29e7abc8e
--- /dev/null
+++ b/debian/openssh-server.install
@@ -0,0 +1,21 @@
1#! /usr/bin/dh-exec
2
3etc/ssh/moduli
4usr/sbin/sshd
5usr/share/man/man5/authorized_keys.5
6usr/share/man/man5/moduli.5
7usr/share/man/man5/sshd_config.5
8usr/share/man/man8/sshd.8
9
10sshd_config => usr/share/openssh/sshd_config
11debian/openssh-server.ucf-md5sum => usr/share/openssh/sshd_config.md5sum
12
13debian/openssh-server.ufw.profile => etc/ufw/applications.d/openssh-server
14debian/systemd/ssh.socket lib/systemd/system
15debian/systemd/rescue-ssh.target lib/systemd/system
16debian/systemd/ssh@.service lib/systemd/system
17debian/systemd/ssh-session-cleanup usr/lib/openssh
18
19# dh_apport would be neater, but at the time of writing it isn't in unstable
20# yet.
21debian/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.maintscript b/debian/openssh-server.maintscript
new file mode 100644
index 000000000..c721fdb48
--- /dev/null
+++ b/debian/openssh-server.maintscript
@@ -0,0 +1,3 @@
1mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd 1:4.7p1-4~
2rm_conffile /etc/init/ssh.conf 1:7.5p1-6~
3rm_conffile /etc/network/if-up.d/openssh-server 1:7.9p1-1~
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
new file mode 100644
index 000000000..552b0744e
--- /dev/null
+++ b/debian/openssh-server.postinst
@@ -0,0 +1,167 @@
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
26host_keys_required() {
27 hostkeys="$(get_config_option HostKey)"
28 if [ "$hostkeys" ]; then
29 echo "$hostkeys"
30 else
31 # No HostKey directives at all, so the server picks some
32 # defaults.
33 echo /etc/ssh/ssh_host_rsa_key
34 echo /etc/ssh/ssh_host_ecdsa_key
35 echo /etc/ssh/ssh_host_ed25519_key
36 fi
37}
38
39
40create_key() {
41 msg="$1"
42 shift
43 hostkeys="$1"
44 shift
45 file="$1"
46 shift
47
48 if echo "$hostkeys" | grep -x "$file" >/dev/null && \
49 [ ! -f "$file" ] ; then
50 echo -n $msg
51 ssh-keygen -q -f "$file" -N '' "$@"
52 echo
53 if which restorecon >/dev/null 2>&1; then
54 restorecon "$file" "$file.pub"
55 fi
56 ssh-keygen -l -f "$file.pub"
57 fi
58}
59
60
61create_keys() {
62 hostkeys="$(host_keys_required)"
63
64 create_key "Creating SSH2 RSA key; this may take some time ..." \
65 "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa
66 create_key "Creating SSH2 DSA key; this may take some time ..." \
67 "$hostkeys" /etc/ssh/ssh_host_dsa_key -t dsa
68 create_key "Creating SSH2 ECDSA key; this may take some time ..." \
69 "$hostkeys" /etc/ssh/ssh_host_ecdsa_key -t ecdsa
70 create_key "Creating SSH2 ED25519 key; this may take some time ..." \
71 "$hostkeys" /etc/ssh/ssh_host_ed25519_key -t ed25519
72}
73
74
75new_config=
76
77cleanup() {
78 if [ "$new_config" ]; then
79 rm -f "$new_config"
80 fi
81}
82
83
84create_sshdconfig() {
85 # XXX cjwatson 2016-12-24: This debconf template is very confusingly
86 # named; its description is "Disable SSH password authentication for
87 # root?", so true -> prohibit-password (the upstream default),
88 # false -> yes.
89 db_get openssh-server/permit-root-login
90 permit_root_login="$RET"
91 db_get openssh-server/password-authentication
92 password_authentication="$RET"
93
94 trap cleanup EXIT
95 new_config="$(tempfile)"
96 cp -a /usr/share/openssh/sshd_config "$new_config"
97 if [ "$permit_root_login" != true ]; then
98 sed -i 's/^#*PermitRootLogin .*/PermitRootLogin yes/' \
99 "$new_config"
100 fi
101 if [ "$password_authentication" != true ]; then
102 sed -i 's/^#PasswordAuthentication .*/PasswordAuthentication no/' \
103 "$new_config"
104 fi
105 mkdir -p /etc/ssh
106 ucf --three-way --debconf-ok \
107 --sum-file /usr/share/openssh/sshd_config.md5sum \
108 "$new_config" /etc/ssh/sshd_config
109 ucfr openssh-server /etc/ssh/sshd_config
110}
111
112fix_statoverride() {
113# Remove an erronous override for sshd (we should have overridden ssh)
114 if dpkg-statoverride --list /usr/sbin/sshd >/dev/null; then
115 dpkg-statoverride --remove /usr/sbin/sshd
116 fi
117}
118
119setup_sshd_user() {
120 if ! getent passwd sshd >/dev/null; then
121 adduser --quiet --system --no-create-home --home /run/sshd --shell /usr/sbin/nologin sshd
122 fi
123}
124
125if [ "$action" = configure ]; then
126 create_sshdconfig
127 create_keys
128 fix_statoverride
129 setup_sshd_user
130 # Renamed to /etc/ssh/moduli in 2.9.9 (!)
131 if dpkg --compare-versions "$2" lt-nl 1:4.7p1-1; then
132 rm -f /etc/ssh/primes
133 fi
134 if dpkg --compare-versions "$2" lt-nl 1:5.5p1-6; then
135 rm -f /run/sshd/.placeholder
136 fi
137 if dpkg --compare-versions "$2" lt-nl 1:6.5p1-2 && \
138 deb-systemd-helper debian-installed ssh.socket && \
139 deb-systemd-helper --quiet was-enabled ssh.service && \
140 deb-systemd-helper --quiet was-enabled ssh.socket; then
141 # 1:6.5p1-1 mistakenly left both ssh.service and ssh.socket
142 # enabled.
143 deb-systemd-helper disable ssh.socket >/dev/null || true
144 fi
145 if dpkg --compare-versions "$2" lt-nl 1:6.5p1-3 && \
146 [ -d /run/systemd/system ]; then
147 # We must stop the sysvinit-controlled sshd before we can
148 # restart it under systemd.
149 start-stop-daemon --stop --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd || true
150 fi
151 if dpkg --compare-versions "$2" lt-nl 1:7.9p1-5 && \
152 [ -f /etc/ssh/moduli.dpkg-bak ]; then
153 # Handle /etc/ssh/moduli being moved from openssh-client to
154 # openssh-server. If there were no user modifications, then we
155 # don't need to do anything special here; but if there were,
156 # then the dpkg-maintscript-helper calls from openssh-client's
157 # maintainer scripts will have saved the old file as .dpkg-bak,
158 # which we now move back into place.
159 mv /etc/ssh/moduli.dpkg-bak /etc/ssh/moduli
160 fi
161fi
162
163#DEBHELPER#
164
165db_stop
166
167exit 0
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm
new file mode 100644
index 000000000..4a716f563
--- /dev/null
+++ b/debian/openssh-server.postrm
@@ -0,0 +1,35 @@
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 for ext in .ucf-new .ucf-old .ucf-dist ""; do
18 rm -f "/etc/ssh/sshd_config$ext"
19 done
20 if which ucf >/dev/null 2>&1; then
21 ucf --purge /etc/ssh/sshd_config
22 fi
23 if which ucfr >/dev/null 2>&1; then
24 ucfr --purge openssh-server /etc/ssh/sshd_config
25 fi
26 rm -f /etc/ssh/sshd_not_to_be_run
27 [ ! -d /etc/ssh ] || rmdir --ignore-fail-on-non-empty /etc/ssh
28
29 if which deluser >/dev/null 2>&1; then
30 deluser --quiet sshd > /dev/null || true
31 fi
32 ;;
33esac
34
35exit 0
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst
new file mode 100644
index 000000000..f5b75124e
--- /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 /run/sshd ]; then
11 # make sure /run/sshd is not removed on upgrades
12 touch /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 100755
index 000000000..620af70e0
--- /dev/null
+++ b/debian/openssh-server.ssh.init
@@ -0,0 +1,162 @@
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_no_start() {
37 # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
38 if [ -e /etc/ssh/sshd_not_to_be_run ]; then
39 if [ "$1" = log_end_msg ]; then
40 log_end_msg 0 || true
41 fi
42 if ! run_by_init; then
43 log_action_msg "OpenBSD Secure Shell server not in use (/etc/ssh/sshd_not_to_be_run)" || true
44 fi
45 exit 0
46 fi
47}
48
49check_dev_null() {
50 if [ ! -c /dev/null ]; then
51 if [ "$1" = log_end_msg ]; then
52 log_end_msg 1 || true
53 fi
54 if ! run_by_init; then
55 log_action_msg "/dev/null is not a character device!" || true
56 fi
57 exit 1
58 fi
59}
60
61check_privsep_dir() {
62 # Create the PrivSep empty dir if necessary
63 if [ ! -d /run/sshd ]; then
64 mkdir /run/sshd
65 chmod 0755 /run/sshd
66 fi
67}
68
69check_config() {
70 if [ ! -e /etc/ssh/sshd_not_to_be_run ]; then
71 /usr/sbin/sshd $SSHD_OPTS -t || exit 1
72 fi
73}
74
75export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
76
77case "$1" in
78 start)
79 check_privsep_dir
80 check_for_no_start
81 check_dev_null
82 log_daemon_msg "Starting OpenBSD Secure Shell server" "sshd" || true
83 if start-stop-daemon --start --quiet --oknodo --chuid 0:0 --pidfile /run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
84 log_end_msg 0 || true
85 else
86 log_end_msg 1 || true
87 fi
88 ;;
89 stop)
90 log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true
91 if start-stop-daemon --stop --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd; then
92 log_end_msg 0 || true
93 else
94 log_end_msg 1 || true
95 fi
96 ;;
97
98 reload|force-reload)
99 check_for_no_start
100 check_config
101 log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true
102 if start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /run/sshd.pid --exec /usr/sbin/sshd; then
103 log_end_msg 0 || true
104 else
105 log_end_msg 1 || true
106 fi
107 ;;
108
109 restart)
110 check_privsep_dir
111 check_config
112 log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
113 start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /run/sshd.pid --exec /usr/sbin/sshd
114 check_for_no_start log_end_msg
115 check_dev_null log_end_msg
116 if start-stop-daemon --start --quiet --oknodo --chuid 0:0 --pidfile /run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
117 log_end_msg 0 || true
118 else
119 log_end_msg 1 || true
120 fi
121 ;;
122
123 try-restart)
124 check_privsep_dir
125 check_config
126 log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true
127 RET=0
128 start-stop-daemon --stop --quiet --retry 30 --pidfile /run/sshd.pid --exec /usr/sbin/sshd || RET="$?"
129 case $RET in
130 0)
131 # old daemon stopped
132 check_for_no_start log_end_msg
133 check_dev_null log_end_msg
134 if start-stop-daemon --start --quiet --oknodo --chuid 0:0 --pidfile /run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then
135 log_end_msg 0 || true
136 else
137 log_end_msg 1 || true
138 fi
139 ;;
140 1)
141 # daemon not running
142 log_progress_msg "(not running)" || true
143 log_end_msg 0 || true
144 ;;
145 *)
146 # failed to stop
147 log_progress_msg "(failed to stop)" || true
148 log_end_msg 1 || true
149 ;;
150 esac
151 ;;
152
153 status)
154 status_of_proc -p /run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $?
155 ;;
156
157 *)
158 log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}" || true
159 exit 1
160esac
161
162exit 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.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..e071fe3b8
--- /dev/null
+++ b/debian/openssh-server.templates
@@ -0,0 +1,23 @@
1Template: openssh-server/permit-root-login
2Type: boolean
3Default: true
4_Description: Disable SSH password authentication for root?
5 Previous versions of openssh-server permitted logging in as root over SSH
6 using password authentication. The default for new installations is now
7 "PermitRootLogin prohibit-password", which disables password authentication
8 for root without breaking systems that have explicitly configured SSH
9 public key authentication for root.
10 .
11 This change makes systems more secure against brute-force password
12 dictionary attacks on the root user (a very common target for such
13 attacks). However, it may break systems that are set up with the
14 expectation of being able to SSH as root using password authentication. You
15 should only make this change if you do not need to do that.
16
17Template: openssh-server/password-authentication
18Type: boolean
19Default: true
20Description: Allow password authentication?
21 By default, the SSH server will allow authenticating using a password.
22 You may want to change this if all users on this system authenticate using
23 a stronger authentication method, such as public keys.
diff --git a/debian/openssh-server.ucf-md5sum b/debian/openssh-server.ucf-md5sum
new file mode 100644
index 000000000..c9c89d429
--- /dev/null
+++ b/debian/openssh-server.ucf-md5sum
@@ -0,0 +1,48 @@
1# Historical md5sums of the default /etc/ssh/sshd_config up to and including
2# 1:7.3p1-5.
30d06fc337cee10609d4833dc88df740f
410dc68360f6658910a98a051273de22c
511f9e107b4d13bbcabe7f8e8da734371
616c827adcff44efaca05ec5eea6383d7
72eeff28468576c3f2e538314e177687b
8386c8b9079625b78f6d624ae506958ae
938fc7b31b3e3078848f0eec457d3e050
10395c5e13801f9b4f17c2cb54aa634fbd
11423d5796cee663af2d0f24c4d520b578
1242be2cb5b64bc91443b2e46969d2d539
1342cd8b7c5ea9e440d3efa50b9a1bb444
144f56ca8d0b5dfdaeb732becd3292ce5d
1554998a682a97af8449e9de0316eacf1d
165c0bdc1735accbdc062381149937ec4a
176357b54acf8e089c57544e06d1bbec53
186a621d8bc448987e5a8a613c40307a4c
19702a79962e60aa17c6d3df742e8ec670
207a69eff91ec92b4e065b8dd8846366b2
217c60e22f183b6219c684f15ce24153fd
228304e780c43d4a606f695c8965f48299
238b9e70ee87f4b822714e2ed7af5b70dc
248caefdd9e251b7cc1baa37874149a870
2590baeb1c778464d2da610f8268939719
26962a382e51f43f80109131838ca326ba
2796eaf22faba705a37905282f6ad69d64
289cb6cd83be1c21f73476be629b163c01
29a07a9865cd33b85a1426cd67954c6fa0
30ae1e844b43986e2a964cf84f46b50c5b
31b516afa5a1e298f4cd00952b36dd623f
32b69fc974ee9b5a111bd473ef54cdd232
33ba9c3f808c811d6f944ad10a508c4767
34bccf9af9c7027afd0895d8ff8e02761a
35bd3a2b95f8b4b180eed707794ad81e4d
36c34586b56496f81a10615c002685fc74
37c47555a21189a6b703d2c5d37d2c50ed
38cac079e87c0ae0d77eafc9b285e36348
39d224f92823483333432974f63cb6dc66
40d50ef9ef2aa51cb9f808f6a776260c0a
41e0029e1e9871d4d2b673ee6d70a38614
42e086e7eb521ccc5776371b2e198f0702
43e101f74dc7381527e9aefa1f78b01a7f
44e24f749808133a27d94fda84a89bb27b
45ec16c3dd0203f13885d74ce529719fda
46efcff5380823d4e3f5039620c2e08459
47f58056370a64dbd2017d7486421c281d
48fe396d52df77f1fbf710591d4dbf3311
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/openssh-tests.install b/debian/openssh-tests.install
new file mode 100644
index 000000000..941704595
--- /dev/null
+++ b/debian/openssh-tests.install
@@ -0,0 +1,11 @@
1regress /usr/lib/openssh
2debian/build-deb/regress/check-perm /usr/lib/openssh/regress
3debian/build-deb/regress/misc /usr/lib/openssh/regress
4debian/build-deb/regress/mkdtemp /usr/lib/openssh/regress
5debian/build-deb/regress/modpipe /usr/lib/openssh/regress
6debian/build-deb/regress/netcat /usr/lib/openssh/regress
7debian/build-deb/regress/setuid-allowed /usr/lib/openssh/regress
8debian/build-deb/regress/unittests /usr/lib/openssh/regress
9
10debian/build-deb/config.h /usr/lib/openssh/regress
11debian/run-tests /usr/lib/openssh/regress
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch
new file mode 100644
index 000000000..c895e63db
--- /dev/null
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -0,0 +1,26 @@
1From 67a6cbb29f77920718884e783238f4a00fe64001 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 70050ffb6..ee166114d 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -356,6 +356,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/check-filenames-in-scp-client.patch b/debian/patches/check-filenames-in-scp-client.patch
new file mode 100644
index 000000000..519358ce6
--- /dev/null
+++ b/debian/patches/check-filenames-in-scp-client.patch
@@ -0,0 +1,187 @@
1From 125924e47db3713a85a70e0f8d6c23818d2ea054 Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Sat, 26 Jan 2019 22:41:28 +0000
4Subject: upstream: check in scp client that filenames sent during
5
6remote->local directory copies satisfy the wildcard specified by the user.
7
8This checking provides some protection against a malicious server
9sending unexpected filenames, but it comes at a risk of rejecting wanted
10files due to differences between client and server wildcard expansion rules.
11
12For this reason, this also adds a new -T flag to disable the check.
13
14reported by Harry Sintonen
15fix approach suggested by markus@;
16has been in snaps for ~1wk courtesy deraadt@
17
18OpenBSD-Commit-ID: 00f44b50d2be8e321973f3c6d014260f8f7a8eda
19
20CVE-2019-6111
21
22Origin: backport, https://anongit.mindrot.org/openssh.git/commit/?id=391ffc4b9d31fa1f4ad566499fef9176ff8a07dc
23Last-Update: 2019-02-08
24
25Patch-Name: check-filenames-in-scp-client.patch
26---
27 scp.1 | 12 +++++++++++-
28 scp.c | 37 +++++++++++++++++++++++++++++--------
29 2 files changed, 40 insertions(+), 9 deletions(-)
30
31diff --git a/scp.1 b/scp.1
32index 0e5cc1b2d..397e77091 100644
33--- a/scp.1
34+++ b/scp.1
35@@ -18,7 +18,7 @@
36 .Nd secure copy (remote file copy program)
37 .Sh SYNOPSIS
38 .Nm scp
39-.Op Fl 346BCpqrv
40+.Op Fl 346BCpqrTv
41 .Op Fl c Ar cipher
42 .Op Fl F Ar ssh_config
43 .Op Fl i Ar identity_file
44@@ -208,6 +208,16 @@ to use for the encrypted connection.
45 The program must understand
46 .Xr ssh 1
47 options.
48+.It Fl T
49+Disable strict filename checking.
50+By default when copying files from a remote host to a local directory
51+.Nm
52+checks that the received filenames match those requested on the command-line
53+to prevent the remote end from sending unexpected or unwanted files.
54+Because of differences in how various operating systems and shells interpret
55+filename wildcards, these checks may cause wanted files to be rejected.
56+This option disables these checks at the expense of fully trusting that
57+the server will not send unexpected filenames.
58 .It Fl v
59 Verbose mode.
60 Causes
61diff --git a/scp.c b/scp.c
62index 1971c80cd..035037bcc 100644
63--- a/scp.c
64+++ b/scp.c
65@@ -94,6 +94,7 @@
66 #include <dirent.h>
67 #include <errno.h>
68 #include <fcntl.h>
69+#include <fnmatch.h>
70 #include <limits.h>
71 #include <locale.h>
72 #include <pwd.h>
73@@ -383,14 +384,14 @@ void verifydir(char *);
74 struct passwd *pwd;
75 uid_t userid;
76 int errs, remin, remout;
77-int pflag, iamremote, iamrecursive, targetshouldbedirectory;
78+int Tflag, pflag, iamremote, iamrecursive, targetshouldbedirectory;
79
80 #define CMDNEEDS 64
81 char cmd[CMDNEEDS]; /* must hold "rcp -r -p -d\0" */
82
83 int response(void);
84 void rsource(char *, struct stat *);
85-void sink(int, char *[]);
86+void sink(int, char *[], const char *);
87 void source(int, char *[]);
88 void tolocal(int, char *[]);
89 void toremote(int, char *[]);
90@@ -429,8 +430,9 @@ main(int argc, char **argv)
91 addargs(&args, "-oRemoteCommand=none");
92 addargs(&args, "-oRequestTTY=no");
93
94- fflag = tflag = 0;
95- while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q12346S:o:F:")) != -1)
96+ fflag = Tflag = tflag = 0;
97+ while ((ch = getopt(argc, argv,
98+ "dfl:prtTvBCc:i:P:q12346S:o:F:")) != -1) {
99 switch (ch) {
100 /* User-visible flags. */
101 case '1':
102@@ -509,9 +511,13 @@ main(int argc, char **argv)
103 setmode(0, O_BINARY);
104 #endif
105 break;
106+ case 'T':
107+ Tflag = 1;
108+ break;
109 default:
110 usage();
111 }
112+ }
113 argc -= optind;
114 argv += optind;
115
116@@ -542,7 +548,7 @@ main(int argc, char **argv)
117 }
118 if (tflag) {
119 /* Receive data. */
120- sink(argc, argv);
121+ sink(argc, argv, NULL);
122 exit(errs != 0);
123 }
124 if (argc < 2)
125@@ -800,7 +806,7 @@ tolocal(int argc, char **argv)
126 continue;
127 }
128 free(bp);
129- sink(1, argv + argc - 1);
130+ sink(1, argv + argc - 1, src);
131 (void) close(remin);
132 remin = remout = -1;
133 }
134@@ -976,7 +982,7 @@ rsource(char *name, struct stat *statp)
135 (sizeof(type) != 4 && sizeof(type) != 8))
136
137 void
138-sink(int argc, char **argv)
139+sink(int argc, char **argv, const char *src)
140 {
141 static BUF buffer;
142 struct stat stb;
143@@ -992,6 +998,7 @@ sink(int argc, char **argv)
144 unsigned long long ull;
145 int setimes, targisdir, wrerrno = 0;
146 char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048];
147+ char *src_copy = NULL, *restrict_pattern = NULL;
148 struct timeval tv[2];
149
150 #define atime tv[0]
151@@ -1016,6 +1023,17 @@ sink(int argc, char **argv)
152 (void) atomicio(vwrite, remout, "", 1);
153 if (stat(targ, &stb) == 0 && S_ISDIR(stb.st_mode))
154 targisdir = 1;
155+ if (src != NULL && !iamrecursive && !Tflag) {
156+ /*
157+ * Prepare to try to restrict incoming filenames to match
158+ * the requested destination file glob.
159+ */
160+ if ((src_copy = strdup(src)) == NULL)
161+ fatal("strdup failed");
162+ if ((restrict_pattern = strrchr(src_copy, '/')) != NULL) {
163+ *restrict_pattern++ = '\0';
164+ }
165+ }
166 for (first = 1;; first = 0) {
167 cp = buf;
168 if (atomicio(read, remin, cp, 1) != 1)
169@@ -1120,6 +1138,9 @@ sink(int argc, char **argv)
170 run_err("error: unexpected filename: %s", cp);
171 exit(1);
172 }
173+ if (restrict_pattern != NULL &&
174+ fnmatch(restrict_pattern, cp, 0) != 0)
175+ SCREWUP("filename does not match request");
176 if (targisdir) {
177 static char *namebuf;
178 static size_t cursize;
179@@ -1157,7 +1178,7 @@ sink(int argc, char **argv)
180 goto bad;
181 }
182 vect[0] = xstrdup(np);
183- sink(1, vect);
184+ sink(1, vect, src);
185 if (setimes) {
186 setimes = 0;
187 if (utimes(vect[0], tv) < 0)
diff --git a/debian/patches/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch
new file mode 100644
index 000000000..90bb3e995
--- /dev/null
+++ b/debian/patches/conch-old-privkey-format.patch
@@ -0,0 +1,71 @@
1From 1d2a55436d4b556269f42ad5f7e16608b5a8ed74 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Thu, 30 Aug 2018 00:58:56 +0100
4Subject: Work around conch interoperability failure
5
6Twisted Conch fails to read private keys in the new format
7(https://twistedmatrix.com/trac/ticket/9515). Work around this until it
8can be fixed in Twisted.
9
10Forwarded: not-needed
11Last-Update: 2018-08-30
12
13Patch-Name: conch-old-privkey-format.patch
14---
15 regress/Makefile | 5 +++--
16 regress/conch-ciphers.sh | 2 +-
17 regress/test-exec.sh | 12 ++++++++++++
18 3 files changed, 16 insertions(+), 3 deletions(-)
19
20diff --git a/regress/Makefile b/regress/Makefile
21index 647b4a049..6e462a4f6 100644
22--- a/regress/Makefile
23+++ b/regress/Makefile
24@@ -110,8 +110,9 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
25 modpipe netcat no_identity_config \
26 pidfile putty.rsa2 ready regress.log \
27 remote_pid revoked-* rsa rsa-agent rsa-agent.pub rsa.pub \
28- rsa1 rsa1-agent rsa1-agent.pub rsa1.pub rsa_ssh2_cr.prv \
29- rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
30+ rsa1 rsa1-agent rsa1-agent.pub rsa1.pub \
31+ rsa_oldfmt rsa_oldfmt.pub \
32+ rsa_ssh2_cr.prv rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
33 scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
34 sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
35 ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
36diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
37index 199d863a0..c7df19fd4 100644
38--- a/regress/conch-ciphers.sh
39+++ b/regress/conch-ciphers.sh
40@@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \
41 rm -f ${COPY}
42 # XXX the 2nd "cat" seems to be needed because of buggy FD handling
43 # in conch
44- ${CONCH} --identity $OBJ/rsa --port $PORT --user $USER -e none \
45+ ${CONCH} --identity $OBJ/rsa_oldfmt --port $PORT --user $USER -e none \
46 --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \
47 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY}
48 if [ $? -ne 0 ]; then
49diff --git a/regress/test-exec.sh b/regress/test-exec.sh
50index 40d46e3cd..1bbd47f25 100644
51--- a/regress/test-exec.sh
52+++ b/regress/test-exec.sh
53@@ -504,6 +504,18 @@ REGRESS_INTEROP_CONCH=no
54 if test -x "$CONCH" ; then
55 REGRESS_INTEROP_CONCH=yes
56 fi
57+case "$SCRIPT" in
58+*conch*) ;;
59+*) REGRESS_INTEROP_CONCH=no
60+esac
61+
62+if test "$REGRESS_INTEROP_CONCH" = "yes" ; then
63+ # Convert rsa key to old format to work around
64+ # https://twistedmatrix.com/trac/ticket/9515
65+ cp $OBJ/rsa $OBJ/rsa_oldfmt
66+ cp $OBJ/rsa.pub $OBJ/rsa_oldfmt.pub
67+ ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/rsa_oldfmt >/dev/null
68+fi
69
70 # If PuTTY is present and we are running a PuTTY test, prepare keys and
71 # configuration
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
new file mode 100644
index 000000000..7963b03ed
--- /dev/null
+++ b/debian/patches/debian-banner.patch
@@ -0,0 +1,111 @@
1From a18385c6866da4d69f46b64626ae5d60b4cf4a66 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: 2018-10-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 6caf1db38..c5dd617ef 100644
23--- a/servconf.c
24+++ b/servconf.c
25@@ -182,6 +182,7 @@ initialize_server_options(ServerOptions *options)
26 options->fingerprint_hash = -1;
27 options->disable_forwarding = -1;
28 options->expose_userauth_info = -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@@ -417,6 +418,8 @@ fill_default_server_options(ServerOptions *options)
34 options->disable_forwarding = 0;
35 if (options->expose_userauth_info == -1)
36 options->expose_userauth_info = 0;
37+ if (options->debian_banner == -1)
38+ options->debian_banner = 1;
39
40 assemble_algorithms(options);
41
42@@ -504,6 +507,7 @@ typedef enum {
43 sStreamLocalBindMask, sStreamLocalBindUnlink,
44 sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
45 sExposeAuthInfo, sRDomain,
46+ sDebianBanner,
47 sDeprecated, sIgnore, sUnsupported
48 } ServerOpCodes;
49
50@@ -661,6 +665,7 @@ static struct {
51 { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
52 { "rdomain", sRDomain, SSHCFG_ALL },
53 { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
54+ { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
55 { NULL, sBadOption, 0 }
56 };
57
58@@ -2173,6 +2178,10 @@ process_server_config_line(ServerOptions *options, char *line,
59 *charptr = xstrdup(arg);
60 break;
61
62+ case sDebianBanner:
63+ intptr = &options->debian_banner;
64+ goto parse_flag;
65+
66 case sDeprecated:
67 case sIgnore:
68 case sUnsupported:
69diff --git a/servconf.h b/servconf.h
70index 3b76da816..4e3c54042 100644
71--- a/servconf.h
72+++ b/servconf.h
73@@ -212,6 +212,8 @@ typedef struct {
74 int fingerprint_hash;
75 int expose_userauth_info;
76 u_int64_t timing_secret;
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 9481272fc..d7e77d343 100644
84--- a/sshd.c
85+++ b/sshd.c
86@@ -384,7 +384,8 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
87 char remote_version[256]; /* Must be at least as big as buf. */
88
89 xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
90- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
91+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
92+ options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
93 *options.version_addendum == '\0' ? "" : " ",
94 options.version_addendum);
95
96diff --git a/sshd_config.5 b/sshd_config.5
97index e7e55dd71..37e6be38f 100644
98--- a/sshd_config.5
99+++ b/sshd_config.5
100@@ -543,6 +543,11 @@ or
101 .Cm no .
102 The default is
103 .Cm yes .
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+.Cm 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..4866d52ad
--- /dev/null
+++ b/debian/patches/debian-config.patch
@@ -0,0 +1,238 @@
1From a433d9baa031d7136a8cf3e3807ebff83a3a8634 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 by default.
15
16sshd: Enable PAM, disable ChallengeResponseAuthentication, and disable
17PrintMotd.
18
19sshd: Enable X11Forwarding.
20
21sshd: Set 'AcceptEnv LANG LC_*' by default.
22
23sshd: Change sftp subsystem path to /usr/lib/openssh/sftp-server.
24
25Document all of this.
26
27Author: Russ Allbery <rra@debian.org>
28Forwarded: not-needed
29Last-Update: 2017-10-04
30
31Patch-Name: debian-config.patch
32---
33 readconf.c | 2 +-
34 ssh.1 | 21 +++++++++++++++++++++
35 ssh_config | 6 +++++-
36 ssh_config.5 | 19 ++++++++++++++++++-
37 sshd_config | 16 ++++++++++------
38 sshd_config.5 | 22 ++++++++++++++++++++++
39 6 files changed, 77 insertions(+), 9 deletions(-)
40
41diff --git a/readconf.c b/readconf.c
42index 6b01f20d2..661b8bf40 100644
43--- a/readconf.c
44+++ b/readconf.c
45@@ -2000,7 +2000,7 @@ fill_default_options(Options * options)
46 if (options->forward_x11 == -1)
47 options->forward_x11 = 0;
48 if (options->forward_x11_trusted == -1)
49- options->forward_x11_trusted = 0;
50+ options->forward_x11_trusted = 1;
51 if (options->forward_x11_timeout == -1)
52 options->forward_x11_timeout = 1200;
53 /*
54diff --git a/ssh.1 b/ssh.1
55index ad1ed0f86..1bcc8edab 100644
56--- a/ssh.1
57+++ b/ssh.1
58@@ -782,6 +782,16 @@ directive in
59 .Xr ssh_config 5
60 for more information.
61 .Pp
62+(Debian-specific: X11 forwarding is not subjected to X11 SECURITY extension
63+restrictions by default, because too many programs currently crash in this
64+mode.
65+Set the
66+.Cm ForwardX11Trusted
67+option to
68+.Dq no
69+to restore the upstream behaviour.
70+This may change in future depending on client-side improvements.)
71+.Pp
72 .It Fl x
73 Disables X11 forwarding.
74 .Pp
75@@ -790,6 +800,17 @@ Enables trusted X11 forwarding.
76 Trusted X11 forwardings are not subjected to the X11 SECURITY extension
77 controls.
78 .Pp
79+(Debian-specific: This option does nothing in the default configuration: it
80+is equivalent to
81+.Dq Cm ForwardX11Trusted No yes ,
82+which is the default as described above.
83+Set the
84+.Cm ForwardX11Trusted
85+option to
86+.Dq no
87+to restore the upstream behaviour.
88+This may change in future depending on client-side improvements.)
89+.Pp
90 .It Fl y
91 Send log information using the
92 .Xr syslog 3
93diff --git a/ssh_config b/ssh_config
94index bcb9f153d..1b676fb2c 100644
95--- a/ssh_config
96+++ b/ssh_config
97@@ -17,9 +17,10 @@
98 # list of available options, their meanings and defaults, please see the
99 # ssh_config(5) man page.
100
101-# Host *
102+Host *
103 # ForwardAgent no
104 # ForwardX11 no
105+# ForwardX11Trusted yes
106 # PasswordAuthentication yes
107 # HostbasedAuthentication no
108 # GSSAPIAuthentication no
109@@ -46,3 +47,6 @@
110 # VisualHostKey no
111 # ProxyCommand ssh -q -W %h:%p gateway.example.com
112 # RekeyLimit 1G 1h
113+ SendEnv LANG LC_*
114+ HashKnownHosts yes
115+ GSSAPIAuthentication yes
116diff --git a/ssh_config.5 b/ssh_config.5
117index a91355726..1a8e24bd1 100644
118--- a/ssh_config.5
119+++ b/ssh_config.5
120@@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
121 host-specific declarations should be given near the beginning of the
122 file, and general defaults at the end.
123 .Pp
124+Note that the Debian
125+.Ic openssh-client
126+package sets several options as standard in
127+.Pa /etc/ssh/ssh_config
128+which are not the default in
129+.Xr ssh 1 :
130+.Pp
131+.Bl -bullet -offset indent -compact
132+.It
133+.Cm SendEnv No LANG LC_*
134+.It
135+.Cm HashKnownHosts No yes
136+.It
137+.Cm GSSAPIAuthentication No yes
138+.El
139+.Pp
140 The file contains keyword-argument pairs, one per line.
141 Lines starting with
142 .Ql #
143@@ -699,11 +715,12 @@ elapsed.
144 .It Cm ForwardX11Trusted
145 If this option is set to
146 .Cm yes ,
147+(the Debian-specific default),
148 remote X11 clients will have full access to the original X11 display.
149 .Pp
150 If this option is set to
151 .Cm no
152-(the default),
153+(the upstream default),
154 remote X11 clients will be considered untrusted and prevented
155 from stealing or tampering with data belonging to trusted X11
156 clients.
157diff --git a/sshd_config b/sshd_config
158index 2c48105f8..ed8272f6d 100644
159--- a/sshd_config
160+++ b/sshd_config
161@@ -57,8 +57,9 @@ AuthorizedKeysFile .ssh/authorized_keys
162 #PasswordAuthentication yes
163 #PermitEmptyPasswords no
164
165-# Change to no to disable s/key passwords
166-#ChallengeResponseAuthentication yes
167+# Change to yes to enable challenge-response passwords (beware issues with
168+# some PAM modules and threads)
169+ChallengeResponseAuthentication no
170
171 # Kerberos options
172 #KerberosAuthentication no
173@@ -81,16 +82,16 @@ AuthorizedKeysFile .ssh/authorized_keys
174 # If you just want the PAM account and session checks to run without
175 # PAM authentication, then enable this but set PasswordAuthentication
176 # and ChallengeResponseAuthentication to 'no'.
177-#UsePAM no
178+UsePAM yes
179
180 #AllowAgentForwarding yes
181 #AllowTcpForwarding yes
182 #GatewayPorts no
183-#X11Forwarding no
184+X11Forwarding yes
185 #X11DisplayOffset 10
186 #X11UseLocalhost yes
187 #PermitTTY yes
188-#PrintMotd yes
189+PrintMotd no
190 #PrintLastLog yes
191 #TCPKeepAlive yes
192 #PermitUserEnvironment no
193@@ -107,8 +108,11 @@ AuthorizedKeysFile .ssh/authorized_keys
194 # no default banner path
195 #Banner none
196
197+# Allow client to pass locale environment variables
198+AcceptEnv LANG LC_*
199+
200 # override default of no subsystems
201-Subsystem sftp /usr/libexec/sftp-server
202+Subsystem sftp /usr/lib/openssh/sftp-server
203
204 # Example of overriding settings on a per-user basis
205 #Match User anoncvs
206diff --git a/sshd_config.5 b/sshd_config.5
207index 23f71fd1d..ba50a30f1 100644
208--- a/sshd_config.5
209+++ b/sshd_config.5
210@@ -56,6 +56,28 @@ Arguments may optionally be enclosed in double quotes
211 .Pq \&"
212 in order to represent arguments containing spaces.
213 .Pp
214+Note that the Debian
215+.Ic openssh-server
216+package sets several options as standard in
217+.Pa /etc/ssh/sshd_config
218+which are not the default in
219+.Xr sshd 8 :
220+.Pp
221+.Bl -bullet -offset indent -compact
222+.It
223+.Cm ChallengeResponseAuthentication No no
224+.It
225+.Cm X11Forwarding No yes
226+.It
227+.Cm PrintMotd No no
228+.It
229+.Cm AcceptEnv No LANG LC_*
230+.It
231+.Cm Subsystem No sftp /usr/lib/openssh/sftp-server
232+.It
233+.Cm UsePAM No yes
234+.El
235+.Pp
236 The possible
237 keywords and their meanings are as follows (note that
238 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..e2acdf1a2
--- /dev/null
+++ b/debian/patches/dnssec-sshfp.patch
@@ -0,0 +1,94 @@
1From 0ee33d93c5c7a5fbb8b027aa24e7c9668125fda9 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 ff1a2c41c..82ec97199 100644
22--- a/dns.c
23+++ b/dns.c
24@@ -211,6 +211,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@@ -234,8 +235,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 dc6fe0533..e061a290a 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 1283f5506..dbbc85a2a 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..c6bc43299
--- /dev/null
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -0,0 +1,28 @@
1From 1d0c41a7e0b2426733ddb598248d0488c9c00a8b 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 7d55fa820..a91355726 100644
17--- a/ssh_config.5
18+++ b/ssh_config.5
19@@ -793,6 +793,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/fix-key-type-check.patch b/debian/patches/fix-key-type-check.patch
new file mode 100644
index 000000000..846df5768
--- /dev/null
+++ b/debian/patches/fix-key-type-check.patch
@@ -0,0 +1,88 @@
1From 5e021158aa22cc64da4fca1618ee0bfd2d031049 Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Fri, 16 Nov 2018 02:43:56 +0000
4Subject: upstream: fix bug in HostbasedAcceptedKeyTypes and
5
6PubkeyAcceptedKeyTypes options. If only RSA-SHA2 siganture types were
7specified, then authentication would always fail for RSA keys as the monitor
8checks only the base key (not the signature algorithm) type against
9*AcceptedKeyTypes. bz#2746; reported by Jakub Jelen; ok dtucker
10
11OpenBSD-Commit-ID: 117bc3dc54578dbdb515a1d3732988cb5b00461b
12
13Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=cd9467318b56e6e93ff9575c906ff8350af9b8a2
14Last-Update: 2019-02-28
15
16Patch-Name: fix-key-type-check.patch
17---
18 monitor.c | 39 ++++++++++++++++++++++++++++++++++-----
19 1 file changed, 34 insertions(+), 5 deletions(-)
20
21diff --git a/monitor.c b/monitor.c
22index 08fddabd7..037d6d333 100644
23--- a/monitor.c
24+++ b/monitor.c
25@@ -1,4 +1,4 @@
26-/* $OpenBSD: monitor.c,v 1.186 2018/07/20 03:46:34 djm Exp $ */
27+/* $OpenBSD: monitor.c,v 1.188 2018/11/16 02:43:56 djm Exp $ */
28 /*
29 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
30 * Copyright 2002 Markus Friedl <markus@openbsd.org>
31@@ -892,6 +892,35 @@ mm_answer_authrole(int sock, struct sshbuf *m)
32 return (0);
33 }
34
35+/*
36+ * Check that the key type appears in the supplied pattern list, ignoring
37+ * mismatches in the signature algorithm. (Signature algorithm checks are
38+ * performed in the unprivileged authentication code).
39+ * Returns 1 on success, 0 otherwise.
40+ */
41+static int
42+key_base_type_match(const char *method, const struct sshkey *key,
43+ const char *list)
44+{
45+ char *s, *l, *ol = xstrdup(list);
46+ int found = 0;
47+
48+ l = ol;
49+ for ((s = strsep(&l, ",")); s && *s != '\0'; (s = strsep(&l, ","))) {
50+ if (sshkey_type_from_name(s) == key->type) {
51+ found = 1;
52+ break;
53+ }
54+ }
55+ if (!found) {
56+ error("%s key type %s is not in permitted list %s", method,
57+ sshkey_ssh_name(key), list);
58+ }
59+
60+ free(ol);
61+ return found;
62+}
63+
64 int
65 mm_answer_authpassword(int sock, struct sshbuf *m)
66 {
67@@ -1197,8 +1226,8 @@ mm_answer_keyallowed(int sock, struct sshbuf *m)
68 break;
69 if (auth2_key_already_used(authctxt, key))
70 break;
71- if (match_pattern_list(sshkey_ssh_name(key),
72- options.pubkey_key_types, 0) != 1)
73+ if (!key_base_type_match(auth_method, key,
74+ options.pubkey_key_types))
75 break;
76 allowed = user_key_allowed(ssh, authctxt->pw, key,
77 pubkey_auth_attempt, &opts);
78@@ -1209,8 +1238,8 @@ mm_answer_keyallowed(int sock, struct sshbuf *m)
79 break;
80 if (auth2_key_already_used(authctxt, key))
81 break;
82- if (match_pattern_list(sshkey_ssh_name(key),
83- options.hostbased_key_types, 0) != 1)
84+ if (!key_base_type_match(auth_method, key,
85+ options.hostbased_key_types))
86 break;
87 allowed = hostbased_key_allowed(authctxt->pw,
88 cuser, chost, key);
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
new file mode 100644
index 000000000..b6d4f1239
--- /dev/null
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -0,0 +1,26 @@
1From df56506f727e37c13346259bdcd5975e257a259d 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 535a69274..e37a13382 100644
16--- a/contrib/gnome-ssh-askpass2.c
17+++ b/contrib/gnome-ssh-askpass2.c
18@@ -211,6 +211,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..f62bf6672
--- /dev/null
+++ b/debian/patches/gssapi.patch
@@ -0,0 +1,3353 @@
1From 72b1d308e6400194ef6e4e7dd45bfa48fa39b5e6 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: 2018-10-20
21
22Patch-Name: gssapi.patch
23---
24 ChangeLog.gssapi | 113 ++++++++++++++++
25 Makefile.in | 3 +-
26 auth-krb5.c | 17 ++-
27 auth.c | 96 +------------
28 auth2-gss.c | 54 +++++++-
29 auth2.c | 2 +
30 canohost.c | 93 +++++++++++++
31 canohost.h | 3 +
32 clientloop.c | 15 ++-
33 config.h.in | 6 +
34 configure.ac | 24 ++++
35 gss-genr.c | 280 +++++++++++++++++++++++++++++++++++++-
36 gss-serv-krb5.c | 85 +++++++++++-
37 gss-serv.c | 184 +++++++++++++++++++++++--
38 kex.c | 19 +++
39 kex.h | 14 ++
40 kexgssc.c | 341 +++++++++++++++++++++++++++++++++++++++++++++++
41 kexgsss.c | 300 +++++++++++++++++++++++++++++++++++++++++
42 monitor.c | 122 +++++++++++++++--
43 monitor.h | 3 +
44 monitor_wrap.c | 53 +++++++-
45 monitor_wrap.h | 4 +-
46 opacket.c | 2 +-
47 opacket.h | 2 +-
48 readconf.c | 43 ++++++
49 readconf.h | 5 +
50 servconf.c | 26 ++++
51 servconf.h | 2 +
52 ssh-gss.h | 41 +++++-
53 ssh_config | 2 +
54 ssh_config.5 | 32 +++++
55 sshconnect2.c | 133 +++++++++++++++++-
56 sshd.c | 110 +++++++++++++++
57 sshd_config | 2 +
58 sshd_config.5 | 10 ++
59 sshkey.c | 3 +-
60 sshkey.h | 1 +
61 37 files changed, 2099 insertions(+), 146 deletions(-)
62 create mode 100644 ChangeLog.gssapi
63 create mode 100644 kexgssc.c
64 create mode 100644 kexgsss.c
65
66diff --git a/ChangeLog.gssapi b/ChangeLog.gssapi
67new file mode 100644
68index 000000000..f117a336a
69--- /dev/null
70+++ b/ChangeLog.gssapi
71@@ -0,0 +1,113 @@
72+20110101
73+ - Finally update for OpenSSH 5.6p1
74+ - Add GSSAPIServerIdentity option from Jim Basney
75+
76+20100308
77+ - [ Makefile.in, key.c, key.h ]
78+ Updates for OpenSSH 5.4p1
79+ - [ servconf.c ]
80+ Include GSSAPI options in the sshd -T configuration dump, and flag
81+ some older configuration options as being unsupported. Thanks to Colin
82+ Watson.
83+ -
84+
85+20100124
86+ - [ sshconnect2.c ]
87+ Adapt to deal with additional element in Authmethod structure. Thanks to
88+ Colin Watson
89+
90+20090615
91+ - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c
92+ sshd.c ]
93+ Fix issues identified by Greg Hudson following a code review
94+ Check return value of gss_indicate_mechs
95+ Protect GSSAPI calls in monitor, so they can only be used if enabled
96+ Check return values of bignum functions in key exchange
97+ Use BN_clear_free to clear other side's DH value
98+ Make ssh_gssapi_id_kex more robust
99+ Only configure kex table pointers if GSSAPI is enabled
100+ Don't leak mechanism list, or gss mechanism list
101+ Cast data.length before printing
102+ If serverkey isn't provided, use an empty string, rather than NULL
103+
104+20090201
105+ - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h
106+ ssh_config.5 sshconnet2.c ]
107+ Add support for the GSSAPIClientIdentity option, which allows the user
108+ to specify which GSSAPI identity to use to contact a given server
109+
110+20080404
111+ - [ gss-serv.c ]
112+ Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow
113+ been omitted from a previous version of this patch. Reported by Borislav
114+ Stoichkov
115+
116+20070317
117+ - [ gss-serv-krb5.c ]
118+ Remove C99ism, where new_ccname was being declared in the middle of a
119+ function
120+
121+20061220
122+ - [ servconf.c ]
123+ Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and
124+ documented, behaviour. Reported by Dan Watson.
125+
126+20060910
127+ - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c
128+ ssh-gss.h ]
129+ add support for gss-group14-sha1 key exchange mechanisms
130+ - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ]
131+ Add GSSAPIStrictAcceptorCheck option to allow the disabling of
132+ acceptor principal checking on multi-homed machines.
133+ <Bugzilla #928>
134+ - [ sshd_config ssh_config ]
135+ Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample
136+ configuration files
137+ - [ kexgss.c kegsss.c sshconnect2.c sshd.c ]
138+ Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf()
139+ Limit length of error messages displayed by client
140+
141+20060909
142+ - [ gss-genr.c gss-serv.c ]
143+ move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server
144+ only, where they belong
145+ <Bugzilla #1225>
146+
147+20060829
148+ - [ gss-serv-krb5.c ]
149+ Fix CCAPI credentials cache name when creating KRB5CCNAME environment
150+ variable
151+
152+20060828
153+ - [ gss-genr.c ]
154+ Avoid Heimdal context freeing problem
155+ <Fixed upstream 20060829>
156+
157+20060818
158+ - [ gss-genr.c ssh-gss.h sshconnect2.c ]
159+ Make sure that SPENGO is disabled
160+ <Bugzilla #1218 - Fixed upstream 20060818>
161+
162+20060421
163+ - [ gssgenr.c, sshconnect2.c ]
164+ a few type changes (signed versus unsigned, int versus size_t) to
165+ fix compiler errors/warnings
166+ (from jbasney AT ncsa.uiuc.edu)
167+ - [ kexgssc.c, sshconnect2.c ]
168+ fix uninitialized variable warnings
169+ (from jbasney AT ncsa.uiuc.edu)
170+ - [ gssgenr.c ]
171+ pass oid to gss_display_status (helpful when using GSSAPI mechglue)
172+ (from jbasney AT ncsa.uiuc.edu)
173+ <Bugzilla #1220 >
174+ - [ gss-serv-krb5.c ]
175+ #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H
176+ (from jbasney AT ncsa.uiuc.edu)
177+ <Fixed upstream 20060304>
178+ - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c
179+ add client-side GssapiKeyExchange option
180+ (from jbasney AT ncsa.uiuc.edu)
181+ - [ sshconnect2.c ]
182+ add support for GssapiTrustDns option for gssapi-with-mic
183+ (from jbasney AT ncsa.uiuc.edu)
184+ <gssapi-with-mic support is Bugzilla #1008>
185diff --git a/Makefile.in b/Makefile.in
186index 126b2c742..70050ffb6 100644
187--- a/Makefile.in
188+++ b/Makefile.in
189@@ -100,6 +100,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
190 kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
191 kexdhc.o kexgexc.o kexecdhc.o kexc25519c.o \
192 kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \
193+ kexgssc.o \
194 platform-pledge.o platform-tracing.o platform-misc.o
195
196 SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \
197@@ -113,7 +114,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \
198 auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
199 auth2-none.o auth2-passwd.o auth2-pubkey.o \
200 monitor.o monitor_wrap.o auth-krb5.o \
201- auth2-gss.o gss-serv.o gss-serv-krb5.o \
202+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o \
203 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
204 sftp-server.o sftp-common.o \
205 sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
206diff --git a/auth-krb5.c b/auth-krb5.c
207index 3096f1c8e..204752e1b 100644
208--- a/auth-krb5.c
209+++ b/auth-krb5.c
210@@ -182,8 +182,13 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
211
212 len = strlen(authctxt->krb5_ticket_file) + 6;
213 authctxt->krb5_ccname = xmalloc(len);
214+#ifdef USE_CCAPI
215+ snprintf(authctxt->krb5_ccname, len, "API:%s",
216+ authctxt->krb5_ticket_file);
217+#else
218 snprintf(authctxt->krb5_ccname, len, "FILE:%s",
219 authctxt->krb5_ticket_file);
220+#endif
221
222 #ifdef USE_PAM
223 if (options.use_pam)
224@@ -240,15 +245,22 @@ krb5_cleanup_proc(Authctxt *authctxt)
225 #ifndef HEIMDAL
226 krb5_error_code
227 ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
228- int tmpfd, ret, oerrno;
229+ int ret, oerrno;
230 char ccname[40];
231 mode_t old_umask;
232+#ifdef USE_CCAPI
233+ char cctemplate[] = "API:krb5cc_%d";
234+#else
235+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX";
236+ int tmpfd;
237+#endif
238
239 ret = snprintf(ccname, sizeof(ccname),
240- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid());
241+ cctemplate, geteuid());
242 if (ret < 0 || (size_t)ret >= sizeof(ccname))
243 return ENOMEM;
244
245+#ifndef USE_CCAPI
246 old_umask = umask(0177);
247 tmpfd = mkstemp(ccname + strlen("FILE:"));
248 oerrno = errno;
249@@ -265,6 +277,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
250 return oerrno;
251 }
252 close(tmpfd);
253+#endif
254
255 return (krb5_cc_resolve(ctx, ccname, ccache));
256 }
257diff --git a/auth.c b/auth.c
258index 3ca3762cc..d8e6b4a3d 100644
259--- a/auth.c
260+++ b/auth.c
261@@ -399,7 +399,8 @@ auth_root_allowed(struct ssh *ssh, const char *method)
262 case PERMIT_NO_PASSWD:
263 if (strcmp(method, "publickey") == 0 ||
264 strcmp(method, "hostbased") == 0 ||
265- strcmp(method, "gssapi-with-mic") == 0)
266+ strcmp(method, "gssapi-with-mic") == 0 ||
267+ strcmp(method, "gssapi-keyex") == 0)
268 return 1;
269 break;
270 case PERMIT_FORCED_ONLY:
271@@ -737,99 +738,6 @@ fakepw(void)
272 return (&fake);
273 }
274
275-/*
276- * Returns the remote DNS hostname as a string. The returned string must not
277- * be freed. NB. this will usually trigger a DNS query the first time it is
278- * called.
279- * This function does additional checks on the hostname to mitigate some
280- * attacks on legacy rhosts-style authentication.
281- * XXX is RhostsRSAAuthentication vulnerable to these?
282- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
283- */
284-
285-static char *
286-remote_hostname(struct ssh *ssh)
287-{
288- struct sockaddr_storage from;
289- socklen_t fromlen;
290- struct addrinfo hints, *ai, *aitop;
291- char name[NI_MAXHOST], ntop2[NI_MAXHOST];
292- const char *ntop = ssh_remote_ipaddr(ssh);
293-
294- /* Get IP address of client. */
295- fromlen = sizeof(from);
296- memset(&from, 0, sizeof(from));
297- if (getpeername(ssh_packet_get_connection_in(ssh),
298- (struct sockaddr *)&from, &fromlen) < 0) {
299- debug("getpeername failed: %.100s", strerror(errno));
300- return strdup(ntop);
301- }
302-
303- ipv64_normalise_mapped(&from, &fromlen);
304- if (from.ss_family == AF_INET6)
305- fromlen = sizeof(struct sockaddr_in6);
306-
307- debug3("Trying to reverse map address %.100s.", ntop);
308- /* Map the IP address to a host name. */
309- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
310- NULL, 0, NI_NAMEREQD) != 0) {
311- /* Host name not found. Use ip address. */
312- return strdup(ntop);
313- }
314-
315- /*
316- * if reverse lookup result looks like a numeric hostname,
317- * someone is trying to trick us by PTR record like following:
318- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5
319- */
320- memset(&hints, 0, sizeof(hints));
321- hints.ai_socktype = SOCK_DGRAM; /*dummy*/
322- hints.ai_flags = AI_NUMERICHOST;
323- if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
324- logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
325- name, ntop);
326- freeaddrinfo(ai);
327- return strdup(ntop);
328- }
329-
330- /* Names are stored in lowercase. */
331- lowercase(name);
332-
333- /*
334- * Map it back to an IP address and check that the given
335- * address actually is an address of this host. This is
336- * necessary because anyone with access to a name server can
337- * define arbitrary names for an IP address. Mapping from
338- * name to IP address can be trusted better (but can still be
339- * fooled if the intruder has access to the name server of
340- * the domain).
341- */
342- memset(&hints, 0, sizeof(hints));
343- hints.ai_family = from.ss_family;
344- hints.ai_socktype = SOCK_STREAM;
345- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
346- logit("reverse mapping checking getaddrinfo for %.700s "
347- "[%s] failed.", name, ntop);
348- return strdup(ntop);
349- }
350- /* Look for the address from the list of addresses. */
351- for (ai = aitop; ai; ai = ai->ai_next) {
352- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
353- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
354- (strcmp(ntop, ntop2) == 0))
355- break;
356- }
357- freeaddrinfo(aitop);
358- /* If we reached the end of the list, the address was not there. */
359- if (ai == NULL) {
360- /* Address not found for the host name. */
361- logit("Address %.100s maps to %.600s, but this does not "
362- "map back to the address.", ntop, name);
363- return strdup(ntop);
364- }
365- return strdup(name);
366-}
367-
368 /*
369 * Return the canonical name of the host in the other side of the current
370 * connection. The host name is cached, so it is efficient to call this
371diff --git a/auth2-gss.c b/auth2-gss.c
372index 9351e0428..1f12bb113 100644
373--- a/auth2-gss.c
374+++ b/auth2-gss.c
375@@ -1,7 +1,7 @@
376 /* $OpenBSD: auth2-gss.c,v 1.29 2018/07/31 03:10:27 djm Exp $ */
377
378 /*
379- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
380+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
381 *
382 * Redistribution and use in source and binary forms, with or without
383 * modification, are permitted provided that the following conditions
384@@ -54,6 +54,46 @@ static int input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh);
385 static int input_gssapi_exchange_complete(int type, u_int32_t plen, struct ssh *ssh);
386 static int input_gssapi_errtok(int, u_int32_t, struct ssh *);
387
388+/*
389+ * The 'gssapi_keyex' userauth mechanism.
390+ */
391+static int
392+userauth_gsskeyex(struct ssh *ssh)
393+{
394+ Authctxt *authctxt = ssh->authctxt;
395+ int r, authenticated = 0;
396+ struct sshbuf *b;
397+ gss_buffer_desc mic, gssbuf;
398+ u_char *p;
399+ size_t len;
400+
401+ if ((r = sshpkt_get_string(ssh, &p, &len)) != 0 ||
402+ (r = sshpkt_get_end(ssh)) != 0)
403+ fatal("%s: %s", __func__, ssh_err(r));
404+ if ((b = sshbuf_new()) == NULL)
405+ fatal("%s: sshbuf_new failed", __func__);
406+ mic.value = p;
407+ mic.length = len;
408+
409+ ssh_gssapi_buildmic(b, authctxt->user, authctxt->service,
410+ "gssapi-keyex");
411+
412+ if ((gssbuf.value = sshbuf_mutable_ptr(b)) == NULL)
413+ fatal("%s: sshbuf_mutable_ptr failed", __func__);
414+ gssbuf.length = sshbuf_len(b);
415+
416+ /* gss_kex_context is NULL with privsep, so we can't check it here */
417+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context,
418+ &gssbuf, &mic))))
419+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
420+ authctxt->pw));
421+
422+ sshbuf_free(b);
423+ free(mic.value);
424+
425+ return (authenticated);
426+}
427+
428 /*
429 * We only support those mechanisms that we know about (ie ones that we know
430 * how to check local user kuserok and the like)
431@@ -260,7 +300,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, struct ssh *ssh)
432 if ((r = sshpkt_get_end(ssh)) != 0)
433 fatal("%s: %s", __func__, ssh_err(r));
434
435- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
436+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
437+ authctxt->pw));
438
439 if ((!use_privsep || mm_is_monitor()) &&
440 (displayname = ssh_gssapi_displayname()) != NULL)
441@@ -306,7 +347,8 @@ input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh)
442 gssbuf.length = sshbuf_len(b);
443
444 if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
445- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
446+ authenticated =
447+ PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw));
448 else
449 logit("GSSAPI MIC check failed");
450
451@@ -326,6 +368,12 @@ input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh)
452 return 0;
453 }
454
455+Authmethod method_gsskeyex = {
456+ "gssapi-keyex",
457+ userauth_gsskeyex,
458+ &options.gss_authentication
459+};
460+
461 Authmethod method_gssapi = {
462 "gssapi-with-mic",
463 userauth_gssapi,
464diff --git a/auth2.c b/auth2.c
465index 4d19957a6..a77742819 100644
466--- a/auth2.c
467+++ b/auth2.c
468@@ -74,6 +74,7 @@ extern Authmethod method_passwd;
469 extern Authmethod method_kbdint;
470 extern Authmethod method_hostbased;
471 #ifdef GSSAPI
472+extern Authmethod method_gsskeyex;
473 extern Authmethod method_gssapi;
474 #endif
475
476@@ -81,6 +82,7 @@ Authmethod *authmethods[] = {
477 &method_none,
478 &method_pubkey,
479 #ifdef GSSAPI
480+ &method_gsskeyex,
481 &method_gssapi,
482 #endif
483 &method_passwd,
484diff --git a/canohost.c b/canohost.c
485index f71a08568..404731d24 100644
486--- a/canohost.c
487+++ b/canohost.c
488@@ -35,6 +35,99 @@
489 #include "canohost.h"
490 #include "misc.h"
491
492+/*
493+ * Returns the remote DNS hostname as a string. The returned string must not
494+ * be freed. NB. this will usually trigger a DNS query the first time it is
495+ * called.
496+ * This function does additional checks on the hostname to mitigate some
497+ * attacks on legacy rhosts-style authentication.
498+ * XXX is RhostsRSAAuthentication vulnerable to these?
499+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
500+ */
501+
502+char *
503+remote_hostname(struct ssh *ssh)
504+{
505+ struct sockaddr_storage from;
506+ socklen_t fromlen;
507+ struct addrinfo hints, *ai, *aitop;
508+ char name[NI_MAXHOST], ntop2[NI_MAXHOST];
509+ const char *ntop = ssh_remote_ipaddr(ssh);
510+
511+ /* Get IP address of client. */
512+ fromlen = sizeof(from);
513+ memset(&from, 0, sizeof(from));
514+ if (getpeername(ssh_packet_get_connection_in(ssh),
515+ (struct sockaddr *)&from, &fromlen) < 0) {
516+ debug("getpeername failed: %.100s", strerror(errno));
517+ return strdup(ntop);
518+ }
519+
520+ ipv64_normalise_mapped(&from, &fromlen);
521+ if (from.ss_family == AF_INET6)
522+ fromlen = sizeof(struct sockaddr_in6);
523+
524+ debug3("Trying to reverse map address %.100s.", ntop);
525+ /* Map the IP address to a host name. */
526+ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
527+ NULL, 0, NI_NAMEREQD) != 0) {
528+ /* Host name not found. Use ip address. */
529+ return strdup(ntop);
530+ }
531+
532+ /*
533+ * if reverse lookup result looks like a numeric hostname,
534+ * someone is trying to trick us by PTR record like following:
535+ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5
536+ */
537+ memset(&hints, 0, sizeof(hints));
538+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/
539+ hints.ai_flags = AI_NUMERICHOST;
540+ if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
541+ logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
542+ name, ntop);
543+ freeaddrinfo(ai);
544+ return strdup(ntop);
545+ }
546+
547+ /* Names are stored in lowercase. */
548+ lowercase(name);
549+
550+ /*
551+ * Map it back to an IP address and check that the given
552+ * address actually is an address of this host. This is
553+ * necessary because anyone with access to a name server can
554+ * define arbitrary names for an IP address. Mapping from
555+ * name to IP address can be trusted better (but can still be
556+ * fooled if the intruder has access to the name server of
557+ * the domain).
558+ */
559+ memset(&hints, 0, sizeof(hints));
560+ hints.ai_family = from.ss_family;
561+ hints.ai_socktype = SOCK_STREAM;
562+ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
563+ logit("reverse mapping checking getaddrinfo for %.700s "
564+ "[%s] failed.", name, ntop);
565+ return strdup(ntop);
566+ }
567+ /* Look for the address from the list of addresses. */
568+ for (ai = aitop; ai; ai = ai->ai_next) {
569+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
570+ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
571+ (strcmp(ntop, ntop2) == 0))
572+ break;
573+ }
574+ freeaddrinfo(aitop);
575+ /* If we reached the end of the list, the address was not there. */
576+ if (ai == NULL) {
577+ /* Address not found for the host name. */
578+ logit("Address %.100s maps to %.600s, but this does not "
579+ "map back to the address.", ntop, name);
580+ return strdup(ntop);
581+ }
582+ return strdup(name);
583+}
584+
585 void
586 ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len)
587 {
588diff --git a/canohost.h b/canohost.h
589index 26d62855a..0cadc9f18 100644
590--- a/canohost.h
591+++ b/canohost.h
592@@ -15,6 +15,9 @@
593 #ifndef _CANOHOST_H
594 #define _CANOHOST_H
595
596+struct ssh;
597+
598+char *remote_hostname(struct ssh *);
599 char *get_peer_ipaddr(int);
600 int get_peer_port(int);
601 char *get_local_ipaddr(int);
602diff --git a/clientloop.c b/clientloop.c
603index 8d312cdaa..1464634b0 100644
604--- a/clientloop.c
605+++ b/clientloop.c
606@@ -112,6 +112,10 @@
607 #include "ssherr.h"
608 #include "hostfile.h"
609
610+#ifdef GSSAPI
611+#include "ssh-gss.h"
612+#endif
613+
614 /* import options */
615 extern Options options;
616
617@@ -1370,9 +1374,18 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
618 break;
619
620 /* Do channel operations unless rekeying in progress. */
621- if (!ssh_packet_is_rekeying(ssh))
622+ if (!ssh_packet_is_rekeying(ssh)) {
623 channel_after_select(ssh, readset, writeset);
624
625+#ifdef GSSAPI
626+ if (options.gss_renewal_rekey &&
627+ ssh_gssapi_credentials_updated(NULL)) {
628+ debug("credentials updated - forcing rekey");
629+ need_rekeying = 1;
630+ }
631+#endif
632+ }
633+
634 /* Buffer input from the connection. */
635 client_process_net_input(readset);
636
637diff --git a/config.h.in b/config.h.in
638index 91b65db8f..209760c7c 100644
639--- a/config.h.in
640+++ b/config.h.in
641@@ -1845,6 +1845,9 @@
642 /* Use btmp to log bad logins */
643 #undef USE_BTMP
644
645+/* platform uses an in-memory credentials cache */
646+#undef USE_CCAPI
647+
648 /* Use libedit for sftp */
649 #undef USE_LIBEDIT
650
651@@ -1860,6 +1863,9 @@
652 /* Use PIPES instead of a socketpair() */
653 #undef USE_PIPES
654
655+/* platform has the Security Authorization Session API */
656+#undef USE_SECURITY_SESSION_API
657+
658 /* Define if you have Solaris privileges */
659 #undef USE_SOLARIS_PRIVS
660
661diff --git a/configure.ac b/configure.ac
662index 7379ab358..023e7cc55 100644
663--- a/configure.ac
664+++ b/configure.ac
665@@ -664,6 +664,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
666 [Use tunnel device compatibility to OpenBSD])
667 AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
668 [Prepend the address family to IP tunnel traffic])
669+ AC_MSG_CHECKING([if we have the Security Authorization Session API])
670+ AC_TRY_COMPILE([#include <Security/AuthSession.h>],
671+ [SessionCreate(0, 0);],
672+ [ac_cv_use_security_session_api="yes"
673+ AC_DEFINE([USE_SECURITY_SESSION_API], [1],
674+ [platform has the Security Authorization Session API])
675+ LIBS="$LIBS -framework Security"
676+ AC_MSG_RESULT([yes])],
677+ [ac_cv_use_security_session_api="no"
678+ AC_MSG_RESULT([no])])
679+ AC_MSG_CHECKING([if we have an in-memory credentials cache])
680+ AC_TRY_COMPILE(
681+ [#include <Kerberos/Kerberos.h>],
682+ [cc_context_t c;
683+ (void) cc_initialize (&c, 0, NULL, NULL);],
684+ [AC_DEFINE([USE_CCAPI], [1],
685+ [platform uses an in-memory credentials cache])
686+ LIBS="$LIBS -framework Security"
687+ AC_MSG_RESULT([yes])
688+ if test "x$ac_cv_use_security_session_api" = "xno"; then
689+ AC_MSG_ERROR([*** Need a security framework to use the credentials cache API ***])
690+ fi],
691+ [AC_MSG_RESULT([no])]
692+ )
693 m4_pattern_allow([AU_IPv])
694 AC_CHECK_DECL([AU_IPv4], [],
695 AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
696diff --git a/gss-genr.c b/gss-genr.c
697index d56257b4a..491e62cee 100644
698--- a/gss-genr.c
699+++ b/gss-genr.c
700@@ -1,7 +1,7 @@
701 /* $OpenBSD: gss-genr.c,v 1.26 2018/07/10 09:13:30 djm Exp $ */
702
703 /*
704- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
705+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
706 *
707 * Redistribution and use in source and binary forms, with or without
708 * modification, are permitted provided that the following conditions
709@@ -39,14 +39,37 @@
710 #include "xmalloc.h"
711 #include "ssherr.h"
712 #include "sshbuf.h"
713+#include "sshkey.h"
714 #include "log.h"
715 #include "ssh2.h"
716+#include "cipher.h"
717+#include "kex.h"
718+#include "digest.h"
719
720 #include "ssh-gss.h"
721
722 extern u_char *session_id2;
723 extern u_int session_id2_len;
724
725+typedef struct {
726+ char *encoded;
727+ gss_OID oid;
728+} ssh_gss_kex_mapping;
729+
730+/*
731+ * XXX - It would be nice to find a more elegant way of handling the
732+ * XXX passing of the key exchange context to the userauth routines
733+ */
734+
735+Gssctxt *gss_kex_context = NULL;
736+
737+static ssh_gss_kex_mapping *gss_enc2oid = NULL;
738+
739+int
740+ssh_gssapi_oid_table_ok(void) {
741+ return (gss_enc2oid != NULL);
742+}
743+
744 /* sshbuf_get for gss_buffer_desc */
745 int
746 ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
747@@ -62,6 +85,143 @@ ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
748 return 0;
749 }
750
751+/*
752+ * Return a list of the gss-group1-sha1 mechanisms supported by this program
753+ *
754+ * We test mechanisms to ensure that we can use them, to avoid starting
755+ * a key exchange with a bad mechanism
756+ */
757+
758+char *
759+ssh_gssapi_client_mechanisms(const char *host, const char *client) {
760+ gss_OID_set gss_supported;
761+ OM_uint32 min_status;
762+
763+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported)))
764+ return NULL;
765+
766+ return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
767+ host, client));
768+}
769+
770+char *
771+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
772+ const char *host, const char *client) {
773+ struct sshbuf *buf;
774+ size_t i;
775+ int r, oidpos, enclen;
776+ char *mechs, *encoded;
777+ u_char digest[SSH_DIGEST_MAX_LENGTH];
778+ char deroid[2];
779+ struct ssh_digest_ctx *md;
780+
781+ if (gss_enc2oid != NULL) {
782+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
783+ free(gss_enc2oid[i].encoded);
784+ free(gss_enc2oid);
785+ }
786+
787+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
788+ (gss_supported->count + 1));
789+
790+ if ((buf = sshbuf_new()) == NULL)
791+ fatal("%s: sshbuf_new failed", __func__);
792+
793+ oidpos = 0;
794+ for (i = 0; i < gss_supported->count; i++) {
795+ if (gss_supported->elements[i].length < 128 &&
796+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) {
797+
798+ deroid[0] = SSH_GSS_OIDTYPE;
799+ deroid[1] = gss_supported->elements[i].length;
800+
801+ if ((md = ssh_digest_start(SSH_DIGEST_MD5)) == NULL ||
802+ ssh_digest_update(md, deroid, 2) != 0 ||
803+ ssh_digest_update(md,
804+ gss_supported->elements[i].elements,
805+ gss_supported->elements[i].length) != 0 ||
806+ ssh_digest_final(md, digest, sizeof(digest)) != 0)
807+ fatal("%s: digest failed", __func__);
808+
809+ encoded = xmalloc(ssh_digest_bytes(SSH_DIGEST_MD5)
810+ * 2);
811+ enclen = __b64_ntop(digest,
812+ ssh_digest_bytes(SSH_DIGEST_MD5), encoded,
813+ ssh_digest_bytes(SSH_DIGEST_MD5) * 2);
814+
815+ if (oidpos != 0) {
816+ if ((r = sshbuf_put_u8(buf, ',')) != 0)
817+ fatal("%s: buffer error: %s",
818+ __func__, ssh_err(r));
819+ }
820+
821+ if ((r = sshbuf_put(buf, KEX_GSS_GEX_SHA1_ID,
822+ sizeof(KEX_GSS_GEX_SHA1_ID) - 1)) != 0 ||
823+ (r = sshbuf_put(buf, encoded, enclen)) != 0 ||
824+ (r = sshbuf_put_u8(buf, ',')) != 0 ||
825+ (r = sshbuf_put(buf, KEX_GSS_GRP1_SHA1_ID,
826+ sizeof(KEX_GSS_GRP1_SHA1_ID) - 1)) != 0 ||
827+ (r = sshbuf_put(buf, encoded, enclen)) != 0 ||
828+ (r = sshbuf_put_u8(buf, ',')) != 0 ||
829+ (r = sshbuf_put(buf, KEX_GSS_GRP14_SHA1_ID,
830+ sizeof(KEX_GSS_GRP14_SHA1_ID) - 1)) != 0 ||
831+ (r = sshbuf_put(buf, encoded, enclen)) != 0)
832+ fatal("%s: buffer error: %s",
833+ __func__, ssh_err(r));
834+
835+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]);
836+ gss_enc2oid[oidpos].encoded = encoded;
837+ oidpos++;
838+ }
839+ }
840+ gss_enc2oid[oidpos].oid = NULL;
841+ gss_enc2oid[oidpos].encoded = NULL;
842+
843+ if ((mechs = sshbuf_dup_string(buf)) == NULL)
844+ fatal("%s: sshbuf_dup_string failed", __func__);
845+
846+ if (strlen(mechs) == 0) {
847+ free(mechs);
848+ mechs = NULL;
849+ }
850+
851+ return (mechs);
852+}
853+
854+gss_OID
855+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) {
856+ int i = 0;
857+
858+ switch (kex_type) {
859+ case KEX_GSS_GRP1_SHA1:
860+ if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID))
861+ return GSS_C_NO_OID;
862+ name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1;
863+ break;
864+ case KEX_GSS_GRP14_SHA1:
865+ if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID))
866+ return GSS_C_NO_OID;
867+ name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1;
868+ break;
869+ case KEX_GSS_GEX_SHA1:
870+ if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID))
871+ return GSS_C_NO_OID;
872+ name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1;
873+ break;
874+ default:
875+ return GSS_C_NO_OID;
876+ }
877+
878+ while (gss_enc2oid[i].encoded != NULL &&
879+ strcmp(name, gss_enc2oid[i].encoded) != 0)
880+ i++;
881+
882+ if (gss_enc2oid[i].oid != NULL && ctx != NULL)
883+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid);
884+
885+ return gss_enc2oid[i].oid;
886+}
887+
888 /* Check that the OID in a data stream matches that in the context */
889 int
890 ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
891@@ -218,7 +378,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
892 }
893
894 ctx->major = gss_init_sec_context(&ctx->minor,
895- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid,
896+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid,
897 GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
898 0, NULL, recv_tok, NULL, send_tok, flags, NULL);
899
900@@ -247,9 +407,43 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
901 return (ctx->major);
902 }
903
904+OM_uint32
905+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name)
906+{
907+ gss_buffer_desc gssbuf;
908+ gss_name_t gssname;
909+ OM_uint32 status;
910+ gss_OID_set oidset;
911+
912+ gssbuf.value = (void *) name;
913+ gssbuf.length = strlen(gssbuf.value);
914+
915+ gss_create_empty_oid_set(&status, &oidset);
916+ gss_add_oid_set_member(&status, ctx->oid, &oidset);
917+
918+ ctx->major = gss_import_name(&ctx->minor, &gssbuf,
919+ GSS_C_NT_USER_NAME, &gssname);
920+
921+ if (!ctx->major)
922+ ctx->major = gss_acquire_cred(&ctx->minor,
923+ gssname, 0, oidset, GSS_C_INITIATE,
924+ &ctx->client_creds, NULL, NULL);
925+
926+ gss_release_name(&status, &gssname);
927+ gss_release_oid_set(&status, &oidset);
928+
929+ if (ctx->major)
930+ ssh_gssapi_error(ctx);
931+
932+ return(ctx->major);
933+}
934+
935 OM_uint32
936 ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
937 {
938+ if (ctx == NULL)
939+ return -1;
940+
941 if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
942 GSS_C_QOP_DEFAULT, buffer, hash)))
943 ssh_gssapi_error(ctx);
944@@ -257,6 +451,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
945 return (ctx->major);
946 }
947
948+/* Priviledged when used by server */
949+OM_uint32
950+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
951+{
952+ if (ctx == NULL)
953+ return -1;
954+
955+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
956+ gssbuf, gssmic, NULL);
957+
958+ return (ctx->major);
959+}
960+
961 void
962 ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
963 const char *context)
964@@ -273,11 +480,16 @@ ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
965 }
966
967 int
968-ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
969+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host,
970+ const char *client)
971 {
972 gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
973 OM_uint32 major, minor;
974 gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
975+ Gssctxt *intctx = NULL;
976+
977+ if (ctx == NULL)
978+ ctx = &intctx;
979
980 /* RFC 4462 says we MUST NOT do SPNEGO */
981 if (oid->length == spnego_oid.length &&
982@@ -287,6 +499,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
983 ssh_gssapi_build_ctx(ctx);
984 ssh_gssapi_set_oid(*ctx, oid);
985 major = ssh_gssapi_import_name(*ctx, host);
986+
987+ if (!GSS_ERROR(major) && client)
988+ major = ssh_gssapi_client_identity(*ctx, client);
989+
990 if (!GSS_ERROR(major)) {
991 major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token,
992 NULL);
993@@ -296,10 +512,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
994 GSS_C_NO_BUFFER);
995 }
996
997- if (GSS_ERROR(major))
998+ if (GSS_ERROR(major) || intctx != NULL)
999 ssh_gssapi_delete_ctx(ctx);
1000
1001 return (!GSS_ERROR(major));
1002 }
1003
1004+int
1005+ssh_gssapi_credentials_updated(Gssctxt *ctxt) {
1006+ static gss_name_t saved_name = GSS_C_NO_NAME;
1007+ static OM_uint32 saved_lifetime = 0;
1008+ static gss_OID saved_mech = GSS_C_NO_OID;
1009+ static gss_name_t name;
1010+ static OM_uint32 last_call = 0;
1011+ OM_uint32 lifetime, now, major, minor;
1012+ int equal;
1013+
1014+ now = time(NULL);
1015+
1016+ if (ctxt) {
1017+ debug("Rekey has happened - updating saved versions");
1018+
1019+ if (saved_name != GSS_C_NO_NAME)
1020+ gss_release_name(&minor, &saved_name);
1021+
1022+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
1023+ &saved_name, &saved_lifetime, NULL, NULL);
1024+
1025+ if (!GSS_ERROR(major)) {
1026+ saved_mech = ctxt->oid;
1027+ saved_lifetime+= now;
1028+ } else {
1029+ /* Handle the error */
1030+ }
1031+ return 0;
1032+ }
1033+
1034+ if (now - last_call < 10)
1035+ return 0;
1036+
1037+ last_call = now;
1038+
1039+ if (saved_mech == GSS_C_NO_OID)
1040+ return 0;
1041+
1042+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
1043+ &name, &lifetime, NULL, NULL);
1044+ if (major == GSS_S_CREDENTIALS_EXPIRED)
1045+ return 0;
1046+ else if (GSS_ERROR(major))
1047+ return 0;
1048+
1049+ major = gss_compare_name(&minor, saved_name, name, &equal);
1050+ gss_release_name(&minor, &name);
1051+ if (GSS_ERROR(major))
1052+ return 0;
1053+
1054+ if (equal && (saved_lifetime < lifetime + now - 10))
1055+ return 1;
1056+
1057+ return 0;
1058+}
1059+
1060 #endif /* GSSAPI */
1061diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
1062index a151bc1e4..90f8692f5 100644
1063--- a/gss-serv-krb5.c
1064+++ b/gss-serv-krb5.c
1065@@ -1,7 +1,7 @@
1066 /* $OpenBSD: gss-serv-krb5.c,v 1.9 2018/07/09 21:37:55 markus Exp $ */
1067
1068 /*
1069- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
1070+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
1071 *
1072 * Redistribution and use in source and binary forms, with or without
1073 * modification, are permitted provided that the following conditions
1074@@ -120,8 +120,8 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
1075 krb5_error_code problem;
1076 krb5_principal princ;
1077 OM_uint32 maj_status, min_status;
1078- int len;
1079 const char *errmsg;
1080+ const char *new_ccname;
1081
1082 if (client->creds == NULL) {
1083 debug("No credentials stored");
1084@@ -180,11 +180,16 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
1085 return;
1086 }
1087
1088- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
1089+ new_ccname = krb5_cc_get_name(krb_context, ccache);
1090+
1091 client->store.envvar = "KRB5CCNAME";
1092- len = strlen(client->store.filename) + 6;
1093- client->store.envval = xmalloc(len);
1094- snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
1095+#ifdef USE_CCAPI
1096+ xasprintf(&client->store.envval, "API:%s", new_ccname);
1097+ client->store.filename = NULL;
1098+#else
1099+ xasprintf(&client->store.envval, "FILE:%s", new_ccname);
1100+ client->store.filename = xstrdup(new_ccname);
1101+#endif
1102
1103 #ifdef USE_PAM
1104 if (options.use_pam)
1105@@ -196,6 +201,71 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
1106 return;
1107 }
1108
1109+int
1110+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store,
1111+ ssh_gssapi_client *client)
1112+{
1113+ krb5_ccache ccache = NULL;
1114+ krb5_principal principal = NULL;
1115+ char *name = NULL;
1116+ krb5_error_code problem;
1117+ OM_uint32 maj_status, min_status;
1118+
1119+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) {
1120+ logit("krb5_cc_resolve(): %.100s",
1121+ krb5_get_err_text(krb_context, problem));
1122+ return 0;
1123+ }
1124+
1125+ /* Find out who the principal in this cache is */
1126+ if ((problem = krb5_cc_get_principal(krb_context, ccache,
1127+ &principal))) {
1128+ logit("krb5_cc_get_principal(): %.100s",
1129+ krb5_get_err_text(krb_context, problem));
1130+ krb5_cc_close(krb_context, ccache);
1131+ return 0;
1132+ }
1133+
1134+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) {
1135+ logit("krb5_unparse_name(): %.100s",
1136+ krb5_get_err_text(krb_context, problem));
1137+ krb5_free_principal(krb_context, principal);
1138+ krb5_cc_close(krb_context, ccache);
1139+ return 0;
1140+ }
1141+
1142+
1143+ if (strcmp(name,client->exportedname.value)!=0) {
1144+ debug("Name in local credentials cache differs. Not storing");
1145+ krb5_free_principal(krb_context, principal);
1146+ krb5_cc_close(krb_context, ccache);
1147+ krb5_free_unparsed_name(krb_context, name);
1148+ return 0;
1149+ }
1150+ krb5_free_unparsed_name(krb_context, name);
1151+
1152+ /* Name matches, so lets get on with it! */
1153+
1154+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) {
1155+ logit("krb5_cc_initialize(): %.100s",
1156+ krb5_get_err_text(krb_context, problem));
1157+ krb5_free_principal(krb_context, principal);
1158+ krb5_cc_close(krb_context, ccache);
1159+ return 0;
1160+ }
1161+
1162+ krb5_free_principal(krb_context, principal);
1163+
1164+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds,
1165+ ccache))) {
1166+ logit("gss_krb5_copy_ccache() failed. Sorry!");
1167+ krb5_cc_close(krb_context, ccache);
1168+ return 0;
1169+ }
1170+
1171+ return 1;
1172+}
1173+
1174 ssh_gssapi_mech gssapi_kerberos_mech = {
1175 "toWM5Slw5Ew8Mqkay+al2g==",
1176 "Kerberos",
1177@@ -203,7 +273,8 @@ ssh_gssapi_mech gssapi_kerberos_mech = {
1178 NULL,
1179 &ssh_gssapi_krb5_userok,
1180 NULL,
1181- &ssh_gssapi_krb5_storecreds
1182+ &ssh_gssapi_krb5_storecreds,
1183+ &ssh_gssapi_krb5_updatecreds
1184 };
1185
1186 #endif /* KRB5 */
1187diff --git a/gss-serv.c b/gss-serv.c
1188index ab3a15f0f..6c087a1b1 100644
1189--- a/gss-serv.c
1190+++ b/gss-serv.c
1191@@ -1,7 +1,7 @@
1192 /* $OpenBSD: gss-serv.c,v 1.31 2018/07/09 21:37:55 markus Exp $ */
1193
1194 /*
1195- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
1196+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1197 *
1198 * Redistribution and use in source and binary forms, with or without
1199 * modification, are permitted provided that the following conditions
1200@@ -44,17 +44,22 @@
1201 #include "session.h"
1202 #include "misc.h"
1203 #include "servconf.h"
1204+#include "uidswap.h"
1205
1206 #include "ssh-gss.h"
1207+#include "monitor_wrap.h"
1208+
1209+extern ServerOptions options;
1210
1211 extern ServerOptions options;
1212
1213 static ssh_gssapi_client gssapi_client =
1214 { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
1215- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL, NULL}};
1216+ GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL,
1217+ {NULL, NULL, NULL, NULL, NULL}, 0, 0};
1218
1219 ssh_gssapi_mech gssapi_null_mech =
1220- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL};
1221+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL};
1222
1223 #ifdef KRB5
1224 extern ssh_gssapi_mech gssapi_kerberos_mech;
1225@@ -140,6 +145,28 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
1226 return (ssh_gssapi_acquire_cred(*ctx));
1227 }
1228
1229+/* Unprivileged */
1230+char *
1231+ssh_gssapi_server_mechanisms(void) {
1232+ if (supported_oids == NULL)
1233+ ssh_gssapi_prepare_supported_oids();
1234+ return (ssh_gssapi_kex_mechs(supported_oids,
1235+ &ssh_gssapi_server_check_mech, NULL, NULL));
1236+}
1237+
1238+/* Unprivileged */
1239+int
1240+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data,
1241+ const char *dummy) {
1242+ Gssctxt *ctx = NULL;
1243+ int res;
1244+
1245+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid)));
1246+ ssh_gssapi_delete_ctx(&ctx);
1247+
1248+ return (res);
1249+}
1250+
1251 /* Unprivileged */
1252 void
1253 ssh_gssapi_supported_oids(gss_OID_set *oidset)
1254@@ -150,7 +177,9 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset)
1255 gss_OID_set supported;
1256
1257 gss_create_empty_oid_set(&min_status, oidset);
1258- gss_indicate_mechs(&min_status, &supported);
1259+
1260+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported)))
1261+ return;
1262
1263 while (supported_mechs[i]->name != NULL) {
1264 if (GSS_ERROR(gss_test_oid_set_member(&min_status,
1265@@ -276,8 +305,48 @@ OM_uint32
1266 ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1267 {
1268 int i = 0;
1269+ int equal = 0;
1270+ gss_name_t new_name = GSS_C_NO_NAME;
1271+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER;
1272+
1273+ if (options.gss_store_rekey && client->used && ctx->client_creds) {
1274+ if (client->mech->oid.length != ctx->oid->length ||
1275+ (memcmp(client->mech->oid.elements,
1276+ ctx->oid->elements, ctx->oid->length) !=0)) {
1277+ debug("Rekeyed credentials have different mechanism");
1278+ return GSS_S_COMPLETE;
1279+ }
1280+
1281+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1282+ ctx->client_creds, ctx->oid, &new_name,
1283+ NULL, NULL, NULL))) {
1284+ ssh_gssapi_error(ctx);
1285+ return (ctx->major);
1286+ }
1287+
1288+ ctx->major = gss_compare_name(&ctx->minor, client->name,
1289+ new_name, &equal);
1290+
1291+ if (GSS_ERROR(ctx->major)) {
1292+ ssh_gssapi_error(ctx);
1293+ return (ctx->major);
1294+ }
1295+
1296+ if (!equal) {
1297+ debug("Rekeyed credentials have different name");
1298+ return GSS_S_COMPLETE;
1299+ }
1300
1301- gss_buffer_desc ename;
1302+ debug("Marking rekeyed credentials for export");
1303+
1304+ gss_release_name(&ctx->minor, &client->name);
1305+ gss_release_cred(&ctx->minor, &client->creds);
1306+ client->name = new_name;
1307+ client->creds = ctx->client_creds;
1308+ ctx->client_creds = GSS_C_NO_CREDENTIAL;
1309+ client->updated = 1;
1310+ return GSS_S_COMPLETE;
1311+ }
1312
1313 client->mech = NULL;
1314
1315@@ -292,6 +361,13 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1316 if (client->mech == NULL)
1317 return GSS_S_FAILURE;
1318
1319+ if (ctx->client_creds &&
1320+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1321+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) {
1322+ ssh_gssapi_error(ctx);
1323+ return (ctx->major);
1324+ }
1325+
1326 if ((ctx->major = gss_display_name(&ctx->minor, ctx->client,
1327 &client->displayname, NULL))) {
1328 ssh_gssapi_error(ctx);
1329@@ -309,6 +385,8 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1330 return (ctx->major);
1331 }
1332
1333+ gss_release_buffer(&ctx->minor, &ename);
1334+
1335 /* We can't copy this structure, so we just move the pointer to it */
1336 client->creds = ctx->client_creds;
1337 ctx->client_creds = GSS_C_NO_CREDENTIAL;
1338@@ -356,7 +434,7 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
1339
1340 /* Privileged */
1341 int
1342-ssh_gssapi_userok(char *user)
1343+ssh_gssapi_userok(char *user, struct passwd *pw)
1344 {
1345 OM_uint32 lmin;
1346
1347@@ -366,9 +444,11 @@ ssh_gssapi_userok(char *user)
1348 return 0;
1349 }
1350 if (gssapi_client.mech && gssapi_client.mech->userok)
1351- if ((*gssapi_client.mech->userok)(&gssapi_client, user))
1352+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) {
1353+ gssapi_client.used = 1;
1354+ gssapi_client.store.owner = pw;
1355 return 1;
1356- else {
1357+ } else {
1358 /* Destroy delegated credentials if userok fails */
1359 gss_release_buffer(&lmin, &gssapi_client.displayname);
1360 gss_release_buffer(&lmin, &gssapi_client.exportedname);
1361@@ -382,14 +462,90 @@ ssh_gssapi_userok(char *user)
1362 return (0);
1363 }
1364
1365-/* Privileged */
1366-OM_uint32
1367-ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
1368+/* These bits are only used for rekeying. The unpriviledged child is running
1369+ * as the user, the monitor is root.
1370+ *
1371+ * In the child, we want to :
1372+ * *) Ask the monitor to store our credentials into the store we specify
1373+ * *) If it succeeds, maybe do a PAM update
1374+ */
1375+
1376+/* Stuff for PAM */
1377+
1378+#ifdef USE_PAM
1379+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg,
1380+ struct pam_response **resp, void *data)
1381 {
1382- ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
1383- gssbuf, gssmic, NULL);
1384+ return (PAM_CONV_ERR);
1385+}
1386+#endif
1387
1388- return (ctx->major);
1389+void
1390+ssh_gssapi_rekey_creds(void) {
1391+ int ok;
1392+ int ret;
1393+#ifdef USE_PAM
1394+ pam_handle_t *pamh = NULL;
1395+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
1396+ char *envstr;
1397+#endif
1398+
1399+ if (gssapi_client.store.filename == NULL &&
1400+ gssapi_client.store.envval == NULL &&
1401+ gssapi_client.store.envvar == NULL)
1402+ return;
1403+
1404+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store));
1405+
1406+ if (!ok)
1407+ return;
1408+
1409+ debug("Rekeyed credentials stored successfully");
1410+
1411+ /* Actually managing to play with the ssh pam stack from here will
1412+ * be next to impossible. In any case, we may want different options
1413+ * for rekeying. So, use our own :)
1414+ */
1415+#ifdef USE_PAM
1416+ if (!use_privsep) {
1417+ debug("Not even going to try and do PAM with privsep disabled");
1418+ return;
1419+ }
1420+
1421+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name,
1422+ &pamconv, &pamh);
1423+ if (ret)
1424+ return;
1425+
1426+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar,
1427+ gssapi_client.store.envval);
1428+
1429+ ret = pam_putenv(pamh, envstr);
1430+ if (!ret)
1431+ pam_setcred(pamh, PAM_REINITIALIZE_CRED);
1432+ pam_end(pamh, PAM_SUCCESS);
1433+#endif
1434+}
1435+
1436+int
1437+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) {
1438+ int ok = 0;
1439+
1440+ /* Check we've got credentials to store */
1441+ if (!gssapi_client.updated)
1442+ return 0;
1443+
1444+ gssapi_client.updated = 0;
1445+
1446+ temporarily_use_uid(gssapi_client.store.owner);
1447+ if (gssapi_client.mech && gssapi_client.mech->updatecreds)
1448+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client);
1449+ else
1450+ debug("No update function for this mechanism");
1451+
1452+ restore_uid();
1453+
1454+ return ok;
1455 }
1456
1457 /* Privileged */
1458diff --git a/kex.c b/kex.c
1459index 25f9f66f6..fb5bfaea5 100644
1460--- a/kex.c
1461+++ b/kex.c
1462@@ -54,6 +54,10 @@
1463 #include "sshbuf.h"
1464 #include "digest.h"
1465
1466+#ifdef GSSAPI
1467+#include "ssh-gss.h"
1468+#endif
1469+
1470 /* prototype */
1471 static int kex_choose_conf(struct ssh *);
1472 static int kex_input_newkeys(int, u_int32_t, struct ssh *);
1473@@ -105,6 +109,14 @@ static const struct kexalg kexalgs[] = {
1474 #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
1475 { NULL, -1, -1, -1},
1476 };
1477+static const struct kexalg kexalg_prefixes[] = {
1478+#ifdef GSSAPI
1479+ { KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, SSH_DIGEST_SHA1 },
1480+ { KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },
1481+ { KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
1482+#endif
1483+ { NULL, -1, -1, -1 },
1484+};
1485
1486 char *
1487 kex_alg_list(char sep)
1488@@ -137,6 +149,10 @@ kex_alg_by_name(const char *name)
1489 if (strcmp(k->name, name) == 0)
1490 return k;
1491 }
1492+ for (k = kexalg_prefixes; k->name != NULL; k++) {
1493+ if (strncmp(k->name, name, strlen(k->name)) == 0)
1494+ return k;
1495+ }
1496 return NULL;
1497 }
1498
1499@@ -653,6 +669,9 @@ kex_free(struct kex *kex)
1500 sshbuf_free(kex->peer);
1501 sshbuf_free(kex->my);
1502 free(kex->session_id);
1503+#ifdef GSSAPI
1504+ free(kex->gss_host);
1505+#endif /* GSSAPI */
1506 free(kex->client_version_string);
1507 free(kex->server_version_string);
1508 free(kex->failed_choice);
1509diff --git a/kex.h b/kex.h
1510index 593de1208..4e5ead839 100644
1511--- a/kex.h
1512+++ b/kex.h
1513@@ -100,6 +100,9 @@ enum kex_exchange {
1514 KEX_DH_GEX_SHA256,
1515 KEX_ECDH_SHA2,
1516 KEX_C25519_SHA256,
1517+ KEX_GSS_GRP1_SHA1,
1518+ KEX_GSS_GRP14_SHA1,
1519+ KEX_GSS_GEX_SHA1,
1520 KEX_MAX
1521 };
1522
1523@@ -148,6 +151,12 @@ struct kex {
1524 u_int flags;
1525 int hash_alg;
1526 int ec_nid;
1527+#ifdef GSSAPI
1528+ int gss_deleg_creds;
1529+ int gss_trust_dns;
1530+ char *gss_host;
1531+ char *gss_client;
1532+#endif
1533 char *client_version_string;
1534 char *server_version_string;
1535 char *failed_choice;
1536@@ -198,6 +207,11 @@ int kexecdh_server(struct ssh *);
1537 int kexc25519_client(struct ssh *);
1538 int kexc25519_server(struct ssh *);
1539
1540+#ifdef GSSAPI
1541+int kexgss_client(struct ssh *);
1542+int kexgss_server(struct ssh *);
1543+#endif
1544+
1545 int kex_dh_hash(int, const char *, const char *,
1546 const u_char *, size_t, const u_char *, size_t, const u_char *, size_t,
1547 const BIGNUM *, const BIGNUM *, const BIGNUM *, u_char *, size_t *);
1548diff --git a/kexgssc.c b/kexgssc.c
1549new file mode 100644
1550index 000000000..3c8ae08dd
1551--- /dev/null
1552+++ b/kexgssc.c
1553@@ -0,0 +1,341 @@
1554+/*
1555+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1556+ *
1557+ * Redistribution and use in source and binary forms, with or without
1558+ * modification, are permitted provided that the following conditions
1559+ * are met:
1560+ * 1. Redistributions of source code must retain the above copyright
1561+ * notice, this list of conditions and the following disclaimer.
1562+ * 2. Redistributions in binary form must reproduce the above copyright
1563+ * notice, this list of conditions and the following disclaimer in the
1564+ * documentation and/or other materials provided with the distribution.
1565+ *
1566+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1567+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1568+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1569+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1570+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1571+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1572+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1573+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1574+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1575+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1576+ */
1577+
1578+#include "includes.h"
1579+
1580+#ifdef GSSAPI
1581+
1582+#include "includes.h"
1583+
1584+#include <openssl/crypto.h>
1585+#include <openssl/bn.h>
1586+
1587+#include <string.h>
1588+
1589+#include "xmalloc.h"
1590+#include "sshbuf.h"
1591+#include "ssh2.h"
1592+#include "sshkey.h"
1593+#include "cipher.h"
1594+#include "kex.h"
1595+#include "log.h"
1596+#include "packet.h"
1597+#include "dh.h"
1598+#include "digest.h"
1599+
1600+#include "ssh-gss.h"
1601+
1602+int
1603+kexgss_client(struct ssh *ssh) {
1604+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
1605+ gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr;
1606+ Gssctxt *ctxt;
1607+ OM_uint32 maj_status, min_status, ret_flags;
1608+ u_int klen, kout, slen = 0, strlen;
1609+ DH *dh;
1610+ BIGNUM *dh_server_pub = NULL;
1611+ BIGNUM *shared_secret = NULL;
1612+ const BIGNUM *pub_key, *dh_p, *dh_g;
1613+ BIGNUM *p = NULL;
1614+ BIGNUM *g = NULL;
1615+ u_char *kbuf;
1616+ u_char *serverhostkey = NULL;
1617+ u_char *empty = "";
1618+ char *msg;
1619+ int type = 0;
1620+ int first = 1;
1621+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX;
1622+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1623+ size_t hashlen;
1624+
1625+ /* Initialise our GSSAPI world */
1626+ ssh_gssapi_build_ctx(&ctxt);
1627+ if (ssh_gssapi_id_kex(ctxt, ssh->kex->name, ssh->kex->kex_type)
1628+ == GSS_C_NO_OID)
1629+ fatal("Couldn't identify host exchange");
1630+
1631+ if (ssh_gssapi_import_name(ctxt, ssh->kex->gss_host))
1632+ fatal("Couldn't import hostname");
1633+
1634+ if (ssh->kex->gss_client &&
1635+ ssh_gssapi_client_identity(ctxt, ssh->kex->gss_client))
1636+ fatal("Couldn't acquire client credentials");
1637+
1638+ switch (ssh->kex->kex_type) {
1639+ case KEX_GSS_GRP1_SHA1:
1640+ dh = dh_new_group1();
1641+ break;
1642+ case KEX_GSS_GRP14_SHA1:
1643+ dh = dh_new_group14();
1644+ break;
1645+ case KEX_GSS_GEX_SHA1:
1646+ debug("Doing group exchange\n");
1647+ nbits = dh_estimate(ssh->kex->we_need * 8);
1648+ packet_start(SSH2_MSG_KEXGSS_GROUPREQ);
1649+ packet_put_int(min);
1650+ packet_put_int(nbits);
1651+ packet_put_int(max);
1652+
1653+ packet_send();
1654+
1655+ packet_read_expect(SSH2_MSG_KEXGSS_GROUP);
1656+
1657+ if ((p = BN_new()) == NULL)
1658+ fatal("BN_new() failed");
1659+ packet_get_bignum2(p);
1660+ if ((g = BN_new()) == NULL)
1661+ fatal("BN_new() failed");
1662+ packet_get_bignum2(g);
1663+ packet_check_eom();
1664+
1665+ if (BN_num_bits(p) < min || BN_num_bits(p) > max)
1666+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d",
1667+ min, BN_num_bits(p), max);
1668+
1669+ dh = dh_new_group(g, p);
1670+ break;
1671+ default:
1672+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1673+ }
1674+
1675+ /* Step 1 - e is dh->pub_key */
1676+ dh_gen_key(dh, ssh->kex->we_need * 8);
1677+ DH_get0_key(dh, &pub_key, NULL);
1678+ DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
1679+
1680+ /* This is f, we initialise it now to make life easier */
1681+ dh_server_pub = BN_new();
1682+ if (dh_server_pub == NULL)
1683+ fatal("dh_server_pub == NULL");
1684+
1685+ token_ptr = GSS_C_NO_BUFFER;
1686+
1687+ do {
1688+ debug("Calling gss_init_sec_context");
1689+
1690+ maj_status = ssh_gssapi_init_ctx(ctxt,
1691+ ssh->kex->gss_deleg_creds, token_ptr, &send_tok,
1692+ &ret_flags);
1693+
1694+ if (GSS_ERROR(maj_status)) {
1695+ if (send_tok.length != 0) {
1696+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1697+ packet_put_string(send_tok.value,
1698+ send_tok.length);
1699+ }
1700+ fatal("gss_init_context failed");
1701+ }
1702+
1703+ /* If we've got an old receive buffer get rid of it */
1704+ if (token_ptr != GSS_C_NO_BUFFER)
1705+ free(recv_tok.value);
1706+
1707+ if (maj_status == GSS_S_COMPLETE) {
1708+ /* If mutual state flag is not true, kex fails */
1709+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
1710+ fatal("Mutual authentication failed");
1711+
1712+ /* If integ avail flag is not true kex fails */
1713+ if (!(ret_flags & GSS_C_INTEG_FLAG))
1714+ fatal("Integrity check failed");
1715+ }
1716+
1717+ /*
1718+ * If we have data to send, then the last message that we
1719+ * received cannot have been a 'complete'.
1720+ */
1721+ if (send_tok.length != 0) {
1722+ if (first) {
1723+ packet_start(SSH2_MSG_KEXGSS_INIT);
1724+ packet_put_string(send_tok.value,
1725+ send_tok.length);
1726+ packet_put_bignum2(pub_key);
1727+ first = 0;
1728+ } else {
1729+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
1730+ packet_put_string(send_tok.value,
1731+ send_tok.length);
1732+ }
1733+ packet_send();
1734+ gss_release_buffer(&min_status, &send_tok);
1735+
1736+ /* If we've sent them data, they should reply */
1737+ do {
1738+ type = packet_read();
1739+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) {
1740+ debug("Received KEXGSS_HOSTKEY");
1741+ if (serverhostkey)
1742+ fatal("Server host key received more than once");
1743+ serverhostkey =
1744+ packet_get_string(&slen);
1745+ }
1746+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY);
1747+
1748+ switch (type) {
1749+ case SSH2_MSG_KEXGSS_CONTINUE:
1750+ debug("Received GSSAPI_CONTINUE");
1751+ if (maj_status == GSS_S_COMPLETE)
1752+ fatal("GSSAPI Continue received from server when complete");
1753+ recv_tok.value = packet_get_string(&strlen);
1754+ recv_tok.length = strlen;
1755+ break;
1756+ case SSH2_MSG_KEXGSS_COMPLETE:
1757+ debug("Received GSSAPI_COMPLETE");
1758+ packet_get_bignum2(dh_server_pub);
1759+ msg_tok.value = packet_get_string(&strlen);
1760+ msg_tok.length = strlen;
1761+
1762+ /* Is there a token included? */
1763+ if (packet_get_char()) {
1764+ recv_tok.value=
1765+ packet_get_string(&strlen);
1766+ recv_tok.length = strlen;
1767+ /* If we're already complete - protocol error */
1768+ if (maj_status == GSS_S_COMPLETE)
1769+ packet_disconnect("Protocol error: received token when complete");
1770+ } else {
1771+ /* No token included */
1772+ if (maj_status != GSS_S_COMPLETE)
1773+ packet_disconnect("Protocol error: did not receive final token");
1774+ }
1775+ break;
1776+ case SSH2_MSG_KEXGSS_ERROR:
1777+ debug("Received Error");
1778+ maj_status = packet_get_int();
1779+ min_status = packet_get_int();
1780+ msg = packet_get_string(NULL);
1781+ (void) packet_get_string_ptr(NULL);
1782+ fatal("GSSAPI Error: \n%.400s",msg);
1783+ default:
1784+ packet_disconnect("Protocol error: didn't expect packet type %d",
1785+ type);
1786+ }
1787+ token_ptr = &recv_tok;
1788+ } else {
1789+ /* No data, and not complete */
1790+ if (maj_status != GSS_S_COMPLETE)
1791+ fatal("Not complete, and no token output");
1792+ }
1793+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
1794+
1795+ /*
1796+ * We _must_ have received a COMPLETE message in reply from the
1797+ * server, which will have set dh_server_pub and msg_tok
1798+ */
1799+
1800+ if (type != SSH2_MSG_KEXGSS_COMPLETE)
1801+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it");
1802+
1803+ /* Check f in range [1, p-1] */
1804+ if (!dh_pub_is_valid(dh, dh_server_pub))
1805+ packet_disconnect("bad server public DH value");
1806+
1807+ /* compute K=f^x mod p */
1808+ klen = DH_size(dh);
1809+ kbuf = xmalloc(klen);
1810+ kout = DH_compute_key(kbuf, dh_server_pub, dh);
1811+ if (kout < 0)
1812+ fatal("DH_compute_key: failed");
1813+
1814+ shared_secret = BN_new();
1815+ if (shared_secret == NULL)
1816+ fatal("kexgss_client: BN_new failed");
1817+
1818+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
1819+ fatal("kexdh_client: BN_bin2bn failed");
1820+
1821+ memset(kbuf, 0, klen);
1822+ free(kbuf);
1823+
1824+ hashlen = sizeof(hash);
1825+ switch (ssh->kex->kex_type) {
1826+ case KEX_GSS_GRP1_SHA1:
1827+ case KEX_GSS_GRP14_SHA1:
1828+ kex_dh_hash(
1829+ ssh->kex->hash_alg,
1830+ ssh->kex->client_version_string,
1831+ ssh->kex->server_version_string,
1832+ sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
1833+ sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
1834+ (serverhostkey ? serverhostkey : empty), slen,
1835+ pub_key, /* e */
1836+ dh_server_pub, /* f */
1837+ shared_secret, /* K */
1838+ hash, &hashlen
1839+ );
1840+ break;
1841+ case KEX_GSS_GEX_SHA1:
1842+ kexgex_hash(
1843+ ssh->kex->hash_alg,
1844+ ssh->kex->client_version_string,
1845+ ssh->kex->server_version_string,
1846+ sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
1847+ sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
1848+ (serverhostkey ? serverhostkey : empty), slen,
1849+ min, nbits, max,
1850+ dh_p, dh_g,
1851+ pub_key,
1852+ dh_server_pub,
1853+ shared_secret,
1854+ hash, &hashlen
1855+ );
1856+ break;
1857+ default:
1858+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
1859+ }
1860+
1861+ gssbuf.value = hash;
1862+ gssbuf.length = hashlen;
1863+
1864+ /* Verify that the hash matches the MIC we just got. */
1865+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
1866+ packet_disconnect("Hash's MIC didn't verify");
1867+
1868+ free(msg_tok.value);
1869+
1870+ DH_free(dh);
1871+ free(serverhostkey);
1872+ BN_clear_free(dh_server_pub);
1873+
1874+ /* save session id */
1875+ if (ssh->kex->session_id == NULL) {
1876+ ssh->kex->session_id_len = hashlen;
1877+ ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
1878+ memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
1879+ }
1880+
1881+ if (ssh->kex->gss_deleg_creds)
1882+ ssh_gssapi_credentials_updated(ctxt);
1883+
1884+ if (gss_kex_context == NULL)
1885+ gss_kex_context = ctxt;
1886+ else
1887+ ssh_gssapi_delete_ctx(&ctxt);
1888+
1889+ kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
1890+ BN_clear_free(shared_secret);
1891+ return kex_send_newkeys(ssh);
1892+}
1893+
1894+#endif /* GSSAPI */
1895diff --git a/kexgsss.c b/kexgsss.c
1896new file mode 100644
1897index 000000000..18070f1d7
1898--- /dev/null
1899+++ b/kexgsss.c
1900@@ -0,0 +1,300 @@
1901+/*
1902+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1903+ *
1904+ * Redistribution and use in source and binary forms, with or without
1905+ * modification, are permitted provided that the following conditions
1906+ * are met:
1907+ * 1. Redistributions of source code must retain the above copyright
1908+ * notice, this list of conditions and the following disclaimer.
1909+ * 2. Redistributions in binary form must reproduce the above copyright
1910+ * notice, this list of conditions and the following disclaimer in the
1911+ * documentation and/or other materials provided with the distribution.
1912+ *
1913+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1914+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1915+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1916+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1917+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1918+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1919+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1920+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1921+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1922+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1923+ */
1924+
1925+#include "includes.h"
1926+
1927+#ifdef GSSAPI
1928+
1929+#include <string.h>
1930+
1931+#include <openssl/crypto.h>
1932+#include <openssl/bn.h>
1933+
1934+#include "xmalloc.h"
1935+#include "sshbuf.h"
1936+#include "ssh2.h"
1937+#include "sshkey.h"
1938+#include "cipher.h"
1939+#include "kex.h"
1940+#include "log.h"
1941+#include "packet.h"
1942+#include "dh.h"
1943+#include "ssh-gss.h"
1944+#include "monitor_wrap.h"
1945+#include "misc.h"
1946+#include "servconf.h"
1947+#include "digest.h"
1948+
1949+extern ServerOptions options;
1950+
1951+int
1952+kexgss_server(struct ssh *ssh)
1953+{
1954+ OM_uint32 maj_status, min_status;
1955+
1956+ /*
1957+ * Some GSSAPI implementations use the input value of ret_flags (an
1958+ * output variable) as a means of triggering mechanism specific
1959+ * features. Initializing it to zero avoids inadvertently
1960+ * activating this non-standard behaviour.
1961+ */
1962+
1963+ OM_uint32 ret_flags = 0;
1964+ gss_buffer_desc gssbuf, recv_tok, msg_tok;
1965+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
1966+ Gssctxt *ctxt = NULL;
1967+ u_int slen, klen, kout;
1968+ u_char *kbuf;
1969+ DH *dh;
1970+ int min = -1, max = -1, nbits = -1;
1971+ const BIGNUM *pub_key, *dh_p, *dh_g;
1972+ BIGNUM *shared_secret = NULL;
1973+ BIGNUM *dh_client_pub = NULL;
1974+ int type = 0;
1975+ gss_OID oid;
1976+ char *mechs;
1977+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1978+ size_t hashlen;
1979+
1980+ /* Initialise GSSAPI */
1981+
1982+ /* If we're rekeying, privsep means that some of the private structures
1983+ * in the GSSAPI code are no longer available. This kludges them back
1984+ * into life
1985+ */
1986+ if (!ssh_gssapi_oid_table_ok()) {
1987+ mechs = ssh_gssapi_server_mechanisms();
1988+ free(mechs);
1989+ }
1990+
1991+ debug2("%s: Identifying %s", __func__, ssh->kex->name);
1992+ oid = ssh_gssapi_id_kex(NULL, ssh->kex->name, ssh->kex->kex_type);
1993+ if (oid == GSS_C_NO_OID)
1994+ fatal("Unknown gssapi mechanism");
1995+
1996+ debug2("%s: Acquiring credentials", __func__);
1997+
1998+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
1999+ fatal("Unable to acquire credentials for the server");
2000+
2001+ switch (ssh->kex->kex_type) {
2002+ case KEX_GSS_GRP1_SHA1:
2003+ dh = dh_new_group1();
2004+ break;
2005+ case KEX_GSS_GRP14_SHA1:
2006+ dh = dh_new_group14();
2007+ break;
2008+ case KEX_GSS_GEX_SHA1:
2009+ debug("Doing group exchange");
2010+ packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ);
2011+ min = packet_get_int();
2012+ nbits = packet_get_int();
2013+ max = packet_get_int();
2014+ packet_check_eom();
2015+ if (max < min || nbits < min || max < nbits)
2016+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
2017+ min, nbits, max);
2018+ dh = PRIVSEP(choose_dh(MAX(DH_GRP_MIN, min),
2019+ nbits, MIN(DH_GRP_MAX, max)));
2020+ if (dh == NULL)
2021+ packet_disconnect("Protocol error: no matching group found");
2022+ DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
2023+
2024+ packet_start(SSH2_MSG_KEXGSS_GROUP);
2025+ packet_put_bignum2(dh_p);
2026+ packet_put_bignum2(dh_g);
2027+ packet_send();
2028+
2029+ packet_write_wait();
2030+ break;
2031+ default:
2032+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
2033+ }
2034+
2035+ dh_gen_key(dh, ssh->kex->we_need * 8);
2036+
2037+ do {
2038+ debug("Wait SSH2_MSG_GSSAPI_INIT");
2039+ type = packet_read();
2040+ switch(type) {
2041+ case SSH2_MSG_KEXGSS_INIT:
2042+ if (dh_client_pub != NULL)
2043+ fatal("Received KEXGSS_INIT after initialising");
2044+ recv_tok.value = packet_get_string(&slen);
2045+ recv_tok.length = slen;
2046+
2047+ if ((dh_client_pub = BN_new()) == NULL)
2048+ fatal("dh_client_pub == NULL");
2049+
2050+ packet_get_bignum2(dh_client_pub);
2051+
2052+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
2053+ break;
2054+ case SSH2_MSG_KEXGSS_CONTINUE:
2055+ recv_tok.value = packet_get_string(&slen);
2056+ recv_tok.length = slen;
2057+ break;
2058+ default:
2059+ packet_disconnect(
2060+ "Protocol error: didn't expect packet type %d",
2061+ type);
2062+ }
2063+
2064+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok,
2065+ &send_tok, &ret_flags));
2066+
2067+ free(recv_tok.value);
2068+
2069+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
2070+ fatal("Zero length token output when incomplete");
2071+
2072+ if (dh_client_pub == NULL)
2073+ fatal("No client public key");
2074+
2075+ if (maj_status & GSS_S_CONTINUE_NEEDED) {
2076+ debug("Sending GSSAPI_CONTINUE");
2077+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
2078+ packet_put_string(send_tok.value, send_tok.length);
2079+ packet_send();
2080+ gss_release_buffer(&min_status, &send_tok);
2081+ }
2082+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
2083+
2084+ if (GSS_ERROR(maj_status)) {
2085+ if (send_tok.length > 0) {
2086+ packet_start(SSH2_MSG_KEXGSS_CONTINUE);
2087+ packet_put_string(send_tok.value, send_tok.length);
2088+ packet_send();
2089+ }
2090+ fatal("accept_ctx died");
2091+ }
2092+
2093+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
2094+ fatal("Mutual Authentication flag wasn't set");
2095+
2096+ if (!(ret_flags & GSS_C_INTEG_FLAG))
2097+ fatal("Integrity flag wasn't set");
2098+
2099+ if (!dh_pub_is_valid(dh, dh_client_pub))
2100+ packet_disconnect("bad client public DH value");
2101+
2102+ klen = DH_size(dh);
2103+ kbuf = xmalloc(klen);
2104+ kout = DH_compute_key(kbuf, dh_client_pub, dh);
2105+ if (kout < 0)
2106+ fatal("DH_compute_key: failed");
2107+
2108+ shared_secret = BN_new();
2109+ if (shared_secret == NULL)
2110+ fatal("kexgss_server: BN_new failed");
2111+
2112+ if (BN_bin2bn(kbuf, kout, shared_secret) == NULL)
2113+ fatal("kexgss_server: BN_bin2bn failed");
2114+
2115+ memset(kbuf, 0, klen);
2116+ free(kbuf);
2117+
2118+ DH_get0_key(dh, &pub_key, NULL);
2119+ DH_get0_pqg(dh, &dh_p, NULL, &dh_g);
2120+
2121+ hashlen = sizeof(hash);
2122+ switch (ssh->kex->kex_type) {
2123+ case KEX_GSS_GRP1_SHA1:
2124+ case KEX_GSS_GRP14_SHA1:
2125+ kex_dh_hash(
2126+ ssh->kex->hash_alg,
2127+ ssh->kex->client_version_string, ssh->kex->server_version_string,
2128+ sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
2129+ sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
2130+ NULL, 0, /* Change this if we start sending host keys */
2131+ dh_client_pub, pub_key, shared_secret,
2132+ hash, &hashlen
2133+ );
2134+ break;
2135+ case KEX_GSS_GEX_SHA1:
2136+ kexgex_hash(
2137+ ssh->kex->hash_alg,
2138+ ssh->kex->client_version_string, ssh->kex->server_version_string,
2139+ sshbuf_ptr(ssh->kex->peer), sshbuf_len(ssh->kex->peer),
2140+ sshbuf_ptr(ssh->kex->my), sshbuf_len(ssh->kex->my),
2141+ NULL, 0,
2142+ min, nbits, max,
2143+ dh_p, dh_g,
2144+ dh_client_pub,
2145+ pub_key,
2146+ shared_secret,
2147+ hash, &hashlen
2148+ );
2149+ break;
2150+ default:
2151+ fatal("%s: Unexpected KEX type %d", __func__, ssh->kex->kex_type);
2152+ }
2153+
2154+ BN_clear_free(dh_client_pub);
2155+
2156+ if (ssh->kex->session_id == NULL) {
2157+ ssh->kex->session_id_len = hashlen;
2158+ ssh->kex->session_id = xmalloc(ssh->kex->session_id_len);
2159+ memcpy(ssh->kex->session_id, hash, ssh->kex->session_id_len);
2160+ }
2161+
2162+ gssbuf.value = hash;
2163+ gssbuf.length = hashlen;
2164+
2165+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok))))
2166+ fatal("Couldn't get MIC");
2167+
2168+ packet_start(SSH2_MSG_KEXGSS_COMPLETE);
2169+ packet_put_bignum2(pub_key);
2170+ packet_put_string(msg_tok.value,msg_tok.length);
2171+
2172+ if (send_tok.length != 0) {
2173+ packet_put_char(1); /* true */
2174+ packet_put_string(send_tok.value, send_tok.length);
2175+ } else {
2176+ packet_put_char(0); /* false */
2177+ }
2178+ packet_send();
2179+
2180+ gss_release_buffer(&min_status, &send_tok);
2181+ gss_release_buffer(&min_status, &msg_tok);
2182+
2183+ if (gss_kex_context == NULL)
2184+ gss_kex_context = ctxt;
2185+ else
2186+ ssh_gssapi_delete_ctx(&ctxt);
2187+
2188+ DH_free(dh);
2189+
2190+ kex_derive_keys_bn(ssh, hash, hashlen, shared_secret);
2191+ BN_clear_free(shared_secret);
2192+ kex_send_newkeys(ssh);
2193+
2194+ /* If this was a rekey, then save out any delegated credentials we
2195+ * just exchanged. */
2196+ if (options.gss_store_rekey)
2197+ ssh_gssapi_rekey_creds();
2198+ return 0;
2199+}
2200+#endif /* GSSAPI */
2201diff --git a/monitor.c b/monitor.c
2202index 531b2993a..eabc1e89b 100644
2203--- a/monitor.c
2204+++ b/monitor.c
2205@@ -145,6 +145,8 @@ int mm_answer_gss_setup_ctx(int, struct sshbuf *);
2206 int mm_answer_gss_accept_ctx(int, struct sshbuf *);
2207 int mm_answer_gss_userok(int, struct sshbuf *);
2208 int mm_answer_gss_checkmic(int, struct sshbuf *);
2209+int mm_answer_gss_sign(int, struct sshbuf *);
2210+int mm_answer_gss_updatecreds(int, struct sshbuf *);
2211 #endif
2212
2213 #ifdef SSH_AUDIT_EVENTS
2214@@ -215,11 +217,18 @@ struct mon_table mon_dispatch_proto20[] = {
2215 {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
2216 {MONITOR_REQ_GSSUSEROK, MON_ONCE|MON_AUTHDECIDE, mm_answer_gss_userok},
2217 {MONITOR_REQ_GSSCHECKMIC, MON_ONCE, mm_answer_gss_checkmic},
2218+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign},
2219 #endif
2220 {0, 0, NULL}
2221 };
2222
2223 struct mon_table mon_dispatch_postauth20[] = {
2224+#ifdef GSSAPI
2225+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx},
2226+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
2227+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign},
2228+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds},
2229+#endif
2230 #ifdef WITH_OPENSSL
2231 {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
2232 #endif
2233@@ -289,6 +298,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor)
2234 /* Permit requests for moduli and signatures */
2235 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
2236 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
2237+#ifdef GSSAPI
2238+ /* and for the GSSAPI key exchange */
2239+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
2240+#endif
2241
2242 /* The first few requests do not require asynchronous access */
2243 while (!authenticated) {
2244@@ -401,6 +414,10 @@ monitor_child_postauth(struct monitor *pmonitor)
2245 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
2246 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
2247 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
2248+#ifdef GSSAPI
2249+ /* and for the GSSAPI key exchange */
2250+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
2251+#endif
2252
2253 if (auth_opts->permit_pty_flag) {
2254 monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1);
2255@@ -1666,6 +1683,13 @@ monitor_apply_keystate(struct monitor *pmonitor)
2256 # endif
2257 #endif /* WITH_OPENSSL */
2258 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
2259+#ifdef GSSAPI
2260+ if (options.gss_keyex) {
2261+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
2262+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
2263+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
2264+ }
2265+#endif
2266 kex->load_host_public_key=&get_hostkey_public_by_type;
2267 kex->load_host_private_key=&get_hostkey_private_by_type;
2268 kex->host_key_index=&get_hostkey_index;
2269@@ -1756,8 +1780,8 @@ mm_answer_gss_setup_ctx(int sock, struct sshbuf *m)
2270 u_char *p;
2271 int r;
2272
2273- if (!options.gss_authentication)
2274- fatal("%s: GSSAPI authentication not enabled", __func__);
2275+ if (!options.gss_authentication && !options.gss_keyex)
2276+ fatal("%s: GSSAPI not enabled", __func__);
2277
2278 if ((r = sshbuf_get_string(m, &p, &len)) != 0)
2279 fatal("%s: buffer error: %s", __func__, ssh_err(r));
2280@@ -1789,8 +1813,8 @@ mm_answer_gss_accept_ctx(int sock, struct sshbuf *m)
2281 OM_uint32 flags = 0; /* GSI needs this */
2282 int r;
2283
2284- if (!options.gss_authentication)
2285- fatal("%s: GSSAPI authentication not enabled", __func__);
2286+ if (!options.gss_authentication && !options.gss_keyex)
2287+ fatal("%s: GSSAPI not enabled", __func__);
2288
2289 if ((r = ssh_gssapi_get_buffer_desc(m, &in)) != 0)
2290 fatal("%s: buffer error: %s", __func__, ssh_err(r));
2291@@ -1810,6 +1834,7 @@ mm_answer_gss_accept_ctx(int sock, struct sshbuf *m)
2292 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
2293 monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
2294 monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
2295+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1);
2296 }
2297 return (0);
2298 }
2299@@ -1821,8 +1846,8 @@ mm_answer_gss_checkmic(int sock, struct sshbuf *m)
2300 OM_uint32 ret;
2301 int r;
2302
2303- if (!options.gss_authentication)
2304- fatal("%s: GSSAPI authentication not enabled", __func__);
2305+ if (!options.gss_authentication && !options.gss_keyex)
2306+ fatal("%s: GSSAPI not enabled", __func__);
2307
2308 if ((r = ssh_gssapi_get_buffer_desc(m, &gssbuf)) != 0 ||
2309 (r = ssh_gssapi_get_buffer_desc(m, &mic)) != 0)
2310@@ -1851,10 +1876,11 @@ mm_answer_gss_userok(int sock, struct sshbuf *m)
2311 int r, authenticated;
2312 const char *displayname;
2313
2314- if (!options.gss_authentication)
2315- fatal("%s: GSSAPI authentication not enabled", __func__);
2316+ if (!options.gss_authentication && !options.gss_keyex)
2317+ fatal("%s: GSSAPI not enabled", __func__);
2318
2319- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user);
2320+ authenticated = authctxt->valid &&
2321+ ssh_gssapi_userok(authctxt->user, authctxt->pw);
2322
2323 sshbuf_reset(m);
2324 if ((r = sshbuf_put_u32(m, authenticated)) != 0)
2325@@ -1871,5 +1897,83 @@ mm_answer_gss_userok(int sock, struct sshbuf *m)
2326 /* Monitor loop will terminate if authenticated */
2327 return (authenticated);
2328 }
2329+
2330+int
2331+mm_answer_gss_sign(int socket, struct sshbuf *m)
2332+{
2333+ gss_buffer_desc data;
2334+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER;
2335+ OM_uint32 major, minor;
2336+ size_t len;
2337+ u_char *p;
2338+ int r;
2339+
2340+ if (!options.gss_authentication && !options.gss_keyex)
2341+ fatal("%s: GSSAPI not enabled", __func__);
2342+
2343+ if ((r = sshbuf_get_string(m, &p, &len)) != 0)
2344+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2345+ data.value = p;
2346+ data.length = len;
2347+ if (data.length != 20)
2348+ fatal("%s: data length incorrect: %d", __func__,
2349+ (int) data.length);
2350+
2351+ /* Save the session ID on the first time around */
2352+ if (session_id2_len == 0) {
2353+ session_id2_len = data.length;
2354+ session_id2 = xmalloc(session_id2_len);
2355+ memcpy(session_id2, data.value, session_id2_len);
2356+ }
2357+ major = ssh_gssapi_sign(gsscontext, &data, &hash);
2358+
2359+ free(data.value);
2360+
2361+ sshbuf_reset(m);
2362+ if ((r = sshbuf_put_u32(m, major)) != 0 ||
2363+ (r = sshbuf_put_string(m, hash.value, hash.length)) != 0)
2364+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2365+
2366+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
2367+
2368+ gss_release_buffer(&minor, &hash);
2369+
2370+ /* Turn on getpwnam permissions */
2371+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1);
2372+
2373+ /* And credential updating, for when rekeying */
2374+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1);
2375+
2376+ return (0);
2377+}
2378+
2379+int
2380+mm_answer_gss_updatecreds(int socket, struct sshbuf *m) {
2381+ ssh_gssapi_ccache store;
2382+ int r, ok;
2383+
2384+ if (!options.gss_authentication && !options.gss_keyex)
2385+ fatal("%s: GSSAPI not enabled", __func__);
2386+
2387+ if ((r = sshbuf_get_cstring(m, &store.filename, NULL)) != 0 ||
2388+ (r = sshbuf_get_cstring(m, &store.envvar, NULL)) != 0 ||
2389+ (r = sshbuf_get_cstring(m, &store.envval, NULL)) != 0)
2390+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2391+
2392+ ok = ssh_gssapi_update_creds(&store);
2393+
2394+ free(store.filename);
2395+ free(store.envvar);
2396+ free(store.envval);
2397+
2398+ sshbuf_reset(m);
2399+ if ((r = sshbuf_put_u32(m, ok)) != 0)
2400+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2401+
2402+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m);
2403+
2404+ return(0);
2405+}
2406+
2407 #endif /* GSSAPI */
2408
2409diff --git a/monitor.h b/monitor.h
2410index 16047299f..44fbed589 100644
2411--- a/monitor.h
2412+++ b/monitor.h
2413@@ -63,6 +63,9 @@ enum monitor_reqtype {
2414 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
2415 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
2416
2417+ MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
2418+ MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
2419+
2420 };
2421
2422 struct monitor {
2423diff --git a/monitor_wrap.c b/monitor_wrap.c
2424index 732fb3476..1865a122a 100644
2425--- a/monitor_wrap.c
2426+++ b/monitor_wrap.c
2427@@ -984,7 +984,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
2428 }
2429
2430 int
2431-mm_ssh_gssapi_userok(char *user)
2432+mm_ssh_gssapi_userok(char *user, struct passwd *pw)
2433 {
2434 struct sshbuf *m;
2435 int r, authenticated = 0;
2436@@ -1003,4 +1003,55 @@ mm_ssh_gssapi_userok(char *user)
2437 debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
2438 return (authenticated);
2439 }
2440+
2441+OM_uint32
2442+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
2443+{
2444+ struct sshbuf *m;
2445+ OM_uint32 major;
2446+ int r;
2447+
2448+ if ((m = sshbuf_new()) == NULL)
2449+ fatal("%s: sshbuf_new failed", __func__);
2450+ if ((r = sshbuf_put_string(m, data->value, data->length)) != 0)
2451+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2452+
2453+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, m);
2454+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, m);
2455+
2456+ if ((r = sshbuf_get_u32(m, &major)) != 0 ||
2457+ (r = ssh_gssapi_get_buffer_desc(m, hash)) != 0)
2458+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2459+
2460+ sshbuf_free(m);
2461+
2462+ return(major);
2463+}
2464+
2465+int
2466+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
2467+{
2468+ struct sshbuf *m;
2469+ int r, ok;
2470+
2471+ if ((m = sshbuf_new()) == NULL)
2472+ fatal("%s: sshbuf_new failed", __func__);
2473+ if ((r = sshbuf_put_cstring(m,
2474+ store->filename ? store->filename : "")) != 0 ||
2475+ (r = sshbuf_put_cstring(m,
2476+ store->envvar ? store->envvar : "")) != 0 ||
2477+ (r = sshbuf_put_cstring(m,
2478+ store->envval ? store->envval : "")) != 0)
2479+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2480+
2481+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, m);
2482+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, m);
2483+
2484+ if ((r = sshbuf_get_u32(m, &ok)) != 0)
2485+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2486+ sshbuf_free(m);
2487+
2488+ return (ok);
2489+}
2490+
2491 #endif /* GSSAPI */
2492diff --git a/monitor_wrap.h b/monitor_wrap.h
2493index 644da081d..7f93144ff 100644
2494--- a/monitor_wrap.h
2495+++ b/monitor_wrap.h
2496@@ -60,8 +60,10 @@ int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t,
2497 OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
2498 OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
2499 gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
2500-int mm_ssh_gssapi_userok(char *user);
2501+int mm_ssh_gssapi_userok(char *user, struct passwd *);
2502 OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
2503+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
2504+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *);
2505 #endif
2506
2507 #ifdef USE_PAM
2508diff --git a/opacket.c b/opacket.c
2509index e637d7a71..7672c0b59 100644
2510--- a/opacket.c
2511+++ b/opacket.c
2512@@ -80,7 +80,7 @@ ssh_packet_put_raw(struct ssh *ssh, const void *buf, u_int len)
2513
2514 #ifdef WITH_OPENSSL
2515 void
2516-ssh_packet_put_bignum2(struct ssh *ssh, BIGNUM * value)
2517+ssh_packet_put_bignum2(struct ssh *ssh, const BIGNUM * value)
2518 {
2519 int r;
2520
2521diff --git a/opacket.h b/opacket.h
2522index f92fe586e..1cf66a2d3 100644
2523--- a/opacket.h
2524+++ b/opacket.h
2525@@ -7,7 +7,7 @@ void ssh_packet_start(struct ssh *, u_char);
2526 void ssh_packet_put_char(struct ssh *, int ch);
2527 void ssh_packet_put_int(struct ssh *, u_int value);
2528 void ssh_packet_put_int64(struct ssh *, u_int64_t value);
2529-void ssh_packet_put_bignum2(struct ssh *, BIGNUM * value);
2530+void ssh_packet_put_bignum2(struct ssh *, const BIGNUM * value);
2531 void ssh_packet_put_ecpoint(struct ssh *, const EC_GROUP *, const EC_POINT *);
2532 void ssh_packet_put_string(struct ssh *, const void *buf, u_int len);
2533 void ssh_packet_put_cstring(struct ssh *, const char *str);
2534diff --git a/readconf.c b/readconf.c
2535index 433811521..36bc5e59a 100644
2536--- a/readconf.c
2537+++ b/readconf.c
2538@@ -161,6 +161,8 @@ typedef enum {
2539 oClearAllForwardings, oNoHostAuthenticationForLocalhost,
2540 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
2541 oAddressFamily, oGssAuthentication, oGssDelegateCreds,
2542+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey,
2543+ oGssServerIdentity,
2544 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
2545 oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist,
2546 oHashKnownHosts,
2547@@ -201,10 +203,20 @@ static struct {
2548 /* Sometimes-unsupported options */
2549 #if defined(GSSAPI)
2550 { "gssapiauthentication", oGssAuthentication },
2551+ { "gssapikeyexchange", oGssKeyEx },
2552 { "gssapidelegatecredentials", oGssDelegateCreds },
2553+ { "gssapitrustdns", oGssTrustDns },
2554+ { "gssapiclientidentity", oGssClientIdentity },
2555+ { "gssapiserveridentity", oGssServerIdentity },
2556+ { "gssapirenewalforcesrekey", oGssRenewalRekey },
2557 # else
2558 { "gssapiauthentication", oUnsupported },
2559+ { "gssapikeyexchange", oUnsupported },
2560 { "gssapidelegatecredentials", oUnsupported },
2561+ { "gssapitrustdns", oUnsupported },
2562+ { "gssapiclientidentity", oUnsupported },
2563+ { "gssapiserveridentity", oUnsupported },
2564+ { "gssapirenewalforcesrekey", oUnsupported },
2565 #endif
2566 #ifdef ENABLE_PKCS11
2567 { "smartcarddevice", oPKCS11Provider },
2568@@ -974,10 +986,30 @@ parse_time:
2569 intptr = &options->gss_authentication;
2570 goto parse_flag;
2571
2572+ case oGssKeyEx:
2573+ intptr = &options->gss_keyex;
2574+ goto parse_flag;
2575+
2576 case oGssDelegateCreds:
2577 intptr = &options->gss_deleg_creds;
2578 goto parse_flag;
2579
2580+ case oGssTrustDns:
2581+ intptr = &options->gss_trust_dns;
2582+ goto parse_flag;
2583+
2584+ case oGssClientIdentity:
2585+ charptr = &options->gss_client_identity;
2586+ goto parse_string;
2587+
2588+ case oGssServerIdentity:
2589+ charptr = &options->gss_server_identity;
2590+ goto parse_string;
2591+
2592+ case oGssRenewalRekey:
2593+ intptr = &options->gss_renewal_rekey;
2594+ goto parse_flag;
2595+
2596 case oBatchMode:
2597 intptr = &options->batch_mode;
2598 goto parse_flag;
2599@@ -1842,7 +1874,12 @@ initialize_options(Options * options)
2600 options->pubkey_authentication = -1;
2601 options->challenge_response_authentication = -1;
2602 options->gss_authentication = -1;
2603+ options->gss_keyex = -1;
2604 options->gss_deleg_creds = -1;
2605+ options->gss_trust_dns = -1;
2606+ options->gss_renewal_rekey = -1;
2607+ options->gss_client_identity = NULL;
2608+ options->gss_server_identity = NULL;
2609 options->password_authentication = -1;
2610 options->kbd_interactive_authentication = -1;
2611 options->kbd_interactive_devices = NULL;
2612@@ -1988,8 +2025,14 @@ fill_default_options(Options * options)
2613 options->challenge_response_authentication = 1;
2614 if (options->gss_authentication == -1)
2615 options->gss_authentication = 0;
2616+ if (options->gss_keyex == -1)
2617+ options->gss_keyex = 0;
2618 if (options->gss_deleg_creds == -1)
2619 options->gss_deleg_creds = 0;
2620+ if (options->gss_trust_dns == -1)
2621+ options->gss_trust_dns = 0;
2622+ if (options->gss_renewal_rekey == -1)
2623+ options->gss_renewal_rekey = 0;
2624 if (options->password_authentication == -1)
2625 options->password_authentication = 1;
2626 if (options->kbd_interactive_authentication == -1)
2627diff --git a/readconf.h b/readconf.h
2628index fc7e38251..8e4900d01 100644
2629--- a/readconf.h
2630+++ b/readconf.h
2631@@ -40,7 +40,12 @@ typedef struct {
2632 int challenge_response_authentication;
2633 /* Try S/Key or TIS, authentication. */
2634 int gss_authentication; /* Try GSS authentication */
2635+ int gss_keyex; /* Try GSS key exchange */
2636 int gss_deleg_creds; /* Delegate GSS credentials */
2637+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */
2638+ int gss_renewal_rekey; /* Credential renewal forces rekey */
2639+ char *gss_client_identity; /* Principal to initiate GSSAPI with */
2640+ char *gss_server_identity; /* GSSAPI target principal */
2641 int password_authentication; /* Try password
2642 * authentication. */
2643 int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
2644diff --git a/servconf.c b/servconf.c
2645index 932d363bb..4668b8a45 100644
2646--- a/servconf.c
2647+++ b/servconf.c
2648@@ -124,8 +124,10 @@ initialize_server_options(ServerOptions *options)
2649 options->kerberos_ticket_cleanup = -1;
2650 options->kerberos_get_afs_token = -1;
2651 options->gss_authentication=-1;
2652+ options->gss_keyex = -1;
2653 options->gss_cleanup_creds = -1;
2654 options->gss_strict_acceptor = -1;
2655+ options->gss_store_rekey = -1;
2656 options->password_authentication = -1;
2657 options->kbd_interactive_authentication = -1;
2658 options->challenge_response_authentication = -1;
2659@@ -337,10 +339,14 @@ fill_default_server_options(ServerOptions *options)
2660 options->kerberos_get_afs_token = 0;
2661 if (options->gss_authentication == -1)
2662 options->gss_authentication = 0;
2663+ if (options->gss_keyex == -1)
2664+ options->gss_keyex = 0;
2665 if (options->gss_cleanup_creds == -1)
2666 options->gss_cleanup_creds = 1;
2667 if (options->gss_strict_acceptor == -1)
2668 options->gss_strict_acceptor = 1;
2669+ if (options->gss_store_rekey == -1)
2670+ options->gss_store_rekey = 0;
2671 if (options->password_authentication == -1)
2672 options->password_authentication = 1;
2673 if (options->kbd_interactive_authentication == -1)
2674@@ -485,6 +491,7 @@ typedef enum {
2675 sHostKeyAlgorithms,
2676 sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
2677 sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
2678+ sGssKeyEx, sGssStoreRekey,
2679 sAcceptEnv, sSetEnv, sPermitTunnel,
2680 sMatch, sPermitOpen, sPermitListen, sForceCommand, sChrootDirectory,
2681 sUsePrivilegeSeparation, sAllowAgentForwarding,
2682@@ -559,12 +566,20 @@ static struct {
2683 #ifdef GSSAPI
2684 { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
2685 { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
2686+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL },
2687 { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
2688+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
2689+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
2690 #else
2691 { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
2692 { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
2693+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL },
2694 { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
2695+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
2696+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
2697 #endif
2698+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL },
2699+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL },
2700 { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
2701 { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
2702 { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
2703@@ -1468,6 +1483,10 @@ process_server_config_line(ServerOptions *options, char *line,
2704 intptr = &options->gss_authentication;
2705 goto parse_flag;
2706
2707+ case sGssKeyEx:
2708+ intptr = &options->gss_keyex;
2709+ goto parse_flag;
2710+
2711 case sGssCleanupCreds:
2712 intptr = &options->gss_cleanup_creds;
2713 goto parse_flag;
2714@@ -1476,6 +1495,10 @@ process_server_config_line(ServerOptions *options, char *line,
2715 intptr = &options->gss_strict_acceptor;
2716 goto parse_flag;
2717
2718+ case sGssStoreRekey:
2719+ intptr = &options->gss_store_rekey;
2720+ goto parse_flag;
2721+
2722 case sPasswordAuthentication:
2723 intptr = &options->password_authentication;
2724 goto parse_flag;
2725@@ -2560,7 +2583,10 @@ dump_config(ServerOptions *o)
2726 #endif
2727 #ifdef GSSAPI
2728 dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
2729+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
2730 dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
2731+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
2732+ dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey);
2733 #endif
2734 dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
2735 dump_cfg_fmtint(sKbdInteractiveAuthentication,
2736diff --git a/servconf.h b/servconf.h
2737index 0175e00e8..3b76da816 100644
2738--- a/servconf.h
2739+++ b/servconf.h
2740@@ -125,8 +125,10 @@ typedef struct {
2741 int kerberos_get_afs_token; /* If true, try to get AFS token if
2742 * authenticated with Kerberos. */
2743 int gss_authentication; /* If true, permit GSSAPI authentication */
2744+ int gss_keyex; /* If true, permit GSSAPI key exchange */
2745 int gss_cleanup_creds; /* If true, destroy cred cache on logout */
2746 int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
2747+ int gss_store_rekey;
2748 int password_authentication; /* If true, permit password
2749 * authentication. */
2750 int kbd_interactive_authentication; /* If true, permit */
2751diff --git a/ssh-gss.h b/ssh-gss.h
2752index 36180d07a..350ce7882 100644
2753--- a/ssh-gss.h
2754+++ b/ssh-gss.h
2755@@ -1,6 +1,6 @@
2756 /* $OpenBSD: ssh-gss.h,v 1.14 2018/07/10 09:13:30 djm Exp $ */
2757 /*
2758- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
2759+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
2760 *
2761 * Redistribution and use in source and binary forms, with or without
2762 * modification, are permitted provided that the following conditions
2763@@ -61,10 +61,22 @@
2764
2765 #define SSH_GSS_OIDTYPE 0x06
2766
2767+#define SSH2_MSG_KEXGSS_INIT 30
2768+#define SSH2_MSG_KEXGSS_CONTINUE 31
2769+#define SSH2_MSG_KEXGSS_COMPLETE 32
2770+#define SSH2_MSG_KEXGSS_HOSTKEY 33
2771+#define SSH2_MSG_KEXGSS_ERROR 34
2772+#define SSH2_MSG_KEXGSS_GROUPREQ 40
2773+#define SSH2_MSG_KEXGSS_GROUP 41
2774+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-"
2775+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-"
2776+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-"
2777+
2778 typedef struct {
2779 char *filename;
2780 char *envvar;
2781 char *envval;
2782+ struct passwd *owner;
2783 void *data;
2784 } ssh_gssapi_ccache;
2785
2786@@ -72,8 +84,11 @@ typedef struct {
2787 gss_buffer_desc displayname;
2788 gss_buffer_desc exportedname;
2789 gss_cred_id_t creds;
2790+ gss_name_t name;
2791 struct ssh_gssapi_mech_struct *mech;
2792 ssh_gssapi_ccache store;
2793+ int used;
2794+ int updated;
2795 } ssh_gssapi_client;
2796
2797 typedef struct ssh_gssapi_mech_struct {
2798@@ -84,6 +99,7 @@ typedef struct ssh_gssapi_mech_struct {
2799 int (*userok) (ssh_gssapi_client *, char *);
2800 int (*localname) (ssh_gssapi_client *, char **);
2801 void (*storecreds) (ssh_gssapi_client *);
2802+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *);
2803 } ssh_gssapi_mech;
2804
2805 typedef struct {
2806@@ -94,10 +110,11 @@ typedef struct {
2807 gss_OID oid; /* client */
2808 gss_cred_id_t creds; /* server */
2809 gss_name_t client; /* server */
2810- gss_cred_id_t client_creds; /* server */
2811+ gss_cred_id_t client_creds; /* both */
2812 } Gssctxt;
2813
2814 extern ssh_gssapi_mech *supported_mechs[];
2815+extern Gssctxt *gss_kex_context;
2816
2817 int ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
2818 void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
2819@@ -123,17 +140,33 @@ void ssh_gssapi_delete_ctx(Gssctxt **);
2820 OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
2821 void ssh_gssapi_buildmic(struct sshbuf *, const char *,
2822 const char *, const char *);
2823-int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
2824+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *);
2825+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *);
2826+int ssh_gssapi_credentials_updated(Gssctxt *);
2827
2828 /* In the server */
2829+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *,
2830+ const char *);
2831+char *ssh_gssapi_client_mechanisms(const char *, const char *);
2832+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *,
2833+ const char *);
2834+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
2835+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *,
2836+ const char *);
2837 OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
2838-int ssh_gssapi_userok(char *name);
2839+int ssh_gssapi_userok(char *name, struct passwd *);
2840 OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
2841 void ssh_gssapi_do_child(char ***, u_int *);
2842 void ssh_gssapi_cleanup_creds(void);
2843 void ssh_gssapi_storecreds(void);
2844 const char *ssh_gssapi_displayname(void);
2845
2846+char *ssh_gssapi_server_mechanisms(void);
2847+int ssh_gssapi_oid_table_ok(void);
2848+
2849+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store);
2850+void ssh_gssapi_rekey_creds(void);
2851+
2852 #endif /* GSSAPI */
2853
2854 #endif /* _SSH_GSS_H */
2855diff --git a/ssh_config b/ssh_config
2856index c12f5ef52..bcb9f153d 100644
2857--- a/ssh_config
2858+++ b/ssh_config
2859@@ -24,6 +24,8 @@
2860 # HostbasedAuthentication no
2861 # GSSAPIAuthentication no
2862 # GSSAPIDelegateCredentials no
2863+# GSSAPIKeyExchange no
2864+# GSSAPITrustDNS no
2865 # BatchMode no
2866 # CheckHostIP yes
2867 # AddressFamily any
2868diff --git a/ssh_config.5 b/ssh_config.5
2869index 4d5b01d3e..16c79368a 100644
2870--- a/ssh_config.5
2871+++ b/ssh_config.5
2872@@ -736,10 +736,42 @@ The default is
2873 Specifies whether user authentication based on GSSAPI is allowed.
2874 The default is
2875 .Cm no .
2876+.It Cm GSSAPIKeyExchange
2877+Specifies whether key exchange based on GSSAPI may be used. When using
2878+GSSAPI key exchange the server need not have a host key.
2879+The default is
2880+.Cm no .
2881+.It Cm GSSAPIClientIdentity
2882+If set, specifies the GSSAPI client identity that ssh should use when
2883+connecting to the server. The default is unset, which means that the default
2884+identity will be used.
2885+.It Cm GSSAPIServerIdentity
2886+If set, specifies the GSSAPI server identity that ssh should expect when
2887+connecting to the server. The default is unset, which means that the
2888+expected GSSAPI server identity will be determined from the target
2889+hostname.
2890 .It Cm GSSAPIDelegateCredentials
2891 Forward (delegate) credentials to the server.
2892 The default is
2893 .Cm no .
2894+.It Cm GSSAPIRenewalForcesRekey
2895+If set to
2896+.Cm yes
2897+then renewal of the client's GSSAPI credentials will force the rekeying of the
2898+ssh connection. With a compatible server, this can delegate the renewed
2899+credentials to a session on the server.
2900+The default is
2901+.Cm no .
2902+.It Cm GSSAPITrustDns
2903+Set to
2904+.Cm yes
2905+to indicate that the DNS is trusted to securely canonicalize
2906+the name of the host being connected to. If
2907+.Cm no ,
2908+the hostname entered on the
2909+command line will be passed untouched to the GSSAPI library.
2910+The default is
2911+.Cm no .
2912 .It Cm HashKnownHosts
2913 Indicates that
2914 .Xr ssh 1
2915diff --git a/sshconnect2.c b/sshconnect2.c
2916index 1675f3935..8c872a4fb 100644
2917--- a/sshconnect2.c
2918+++ b/sshconnect2.c
2919@@ -162,6 +162,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2920 struct kex *kex;
2921 int r;
2922
2923+#ifdef GSSAPI
2924+ char *orig = NULL, *gss = NULL;
2925+ char *gss_host = NULL;
2926+#endif
2927+
2928 xxx_host = host;
2929 xxx_hostaddr = hostaddr;
2930
2931@@ -194,6 +199,35 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2932 order_hostkeyalgs(host, hostaddr, port));
2933 }
2934
2935+#ifdef GSSAPI
2936+ if (options.gss_keyex) {
2937+ /* Add the GSSAPI mechanisms currently supported on this
2938+ * client to the key exchange algorithm proposal */
2939+ orig = myproposal[PROPOSAL_KEX_ALGS];
2940+
2941+ if (options.gss_server_identity)
2942+ gss_host = xstrdup(options.gss_server_identity);
2943+ else if (options.gss_trust_dns)
2944+ gss_host = remote_hostname(active_state);
2945+ else
2946+ gss_host = xstrdup(host);
2947+
2948+ gss = ssh_gssapi_client_mechanisms(gss_host,
2949+ options.gss_client_identity);
2950+ if (gss) {
2951+ debug("Offering GSSAPI proposal: %s", gss);
2952+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
2953+ "%s,%s", gss, orig);
2954+
2955+ /* If we've got GSSAPI algorithms, then we also
2956+ * support the 'null' hostkey, as a last resort */
2957+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
2958+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS],
2959+ "%s,null", orig);
2960+ }
2961+ }
2962+#endif
2963+
2964 if (options.rekey_limit || options.rekey_interval)
2965 packet_set_rekey_limits(options.rekey_limit,
2966 options.rekey_interval);
2967@@ -215,15 +249,41 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
2968 # endif
2969 #endif
2970 kex->kex[KEX_C25519_SHA256] = kexc25519_client;
2971+#ifdef GSSAPI
2972+ if (options.gss_keyex) {
2973+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
2974+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client;
2975+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client;
2976+ }
2977+#endif
2978 kex->client_version_string=client_version_string;
2979 kex->server_version_string=server_version_string;
2980 kex->verify_host_key=&verify_host_key_callback;
2981
2982+#ifdef GSSAPI
2983+ if (options.gss_keyex) {
2984+ kex->gss_deleg_creds = options.gss_deleg_creds;
2985+ kex->gss_trust_dns = options.gss_trust_dns;
2986+ kex->gss_client = options.gss_client_identity;
2987+ kex->gss_host = gss_host;
2988+ }
2989+#endif
2990+
2991 ssh_dispatch_run_fatal(active_state, DISPATCH_BLOCK, &kex->done);
2992
2993 /* remove ext-info from the KEX proposals for rekeying */
2994 myproposal[PROPOSAL_KEX_ALGS] =
2995 compat_kex_proposal(options.kex_algorithms);
2996+#ifdef GSSAPI
2997+ /* repair myproposal after it was crumpled by the */
2998+ /* ext-info removal above */
2999+ if (gss) {
3000+ orig = myproposal[PROPOSAL_KEX_ALGS];
3001+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
3002+ "%s,%s", gss, orig);
3003+ free(gss);
3004+ }
3005+#endif
3006 if ((r = kex_prop2buf(kex->my, myproposal)) != 0)
3007 fatal("kex_prop2buf: %s", ssh_err(r));
3008
3009@@ -314,6 +374,7 @@ int input_gssapi_token(int type, u_int32_t, struct ssh *);
3010 int input_gssapi_hash(int type, u_int32_t, struct ssh *);
3011 int input_gssapi_error(int, u_int32_t, struct ssh *);
3012 int input_gssapi_errtok(int, u_int32_t, struct ssh *);
3013+int userauth_gsskeyex(Authctxt *authctxt);
3014 #endif
3015
3016 void userauth(Authctxt *, char *);
3017@@ -330,6 +391,11 @@ static char *authmethods_get(void);
3018
3019 Authmethod authmethods[] = {
3020 #ifdef GSSAPI
3021+ {"gssapi-keyex",
3022+ userauth_gsskeyex,
3023+ NULL,
3024+ &options.gss_authentication,
3025+ NULL},
3026 {"gssapi-with-mic",
3027 userauth_gssapi,
3028 NULL,
3029@@ -686,25 +752,40 @@ userauth_gssapi(Authctxt *authctxt)
3030 static u_int mech = 0;
3031 OM_uint32 min;
3032 int r, ok = 0;
3033+ char *gss_host;
3034+
3035+ if (options.gss_server_identity)
3036+ gss_host = xstrdup(options.gss_server_identity);
3037+ else if (options.gss_trust_dns)
3038+ gss_host = remote_hostname(active_state);
3039+ else
3040+ gss_host = xstrdup(authctxt->host);
3041
3042 /* Try one GSSAPI method at a time, rather than sending them all at
3043 * once. */
3044
3045 if (gss_supported == NULL)
3046- gss_indicate_mechs(&min, &gss_supported);
3047+ if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) {
3048+ gss_supported = NULL;
3049+ free(gss_host);
3050+ return 0;
3051+ }
3052
3053 /* Check to see if the mechanism is usable before we offer it */
3054 while (mech < gss_supported->count && !ok) {
3055 /* My DER encoding requires length<128 */
3056 if (gss_supported->elements[mech].length < 128 &&
3057 ssh_gssapi_check_mechanism(&gssctxt,
3058- &gss_supported->elements[mech], authctxt->host)) {
3059+ &gss_supported->elements[mech], gss_host,
3060+ options.gss_client_identity)) {
3061 ok = 1; /* Mechanism works */
3062 } else {
3063 mech++;
3064 }
3065 }
3066
3067+ free(gss_host);
3068+
3069 if (!ok)
3070 return 0;
3071
3072@@ -935,6 +1016,54 @@ input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
3073 free(lang);
3074 return r;
3075 }
3076+
3077+int
3078+userauth_gsskeyex(Authctxt *authctxt)
3079+{
3080+ struct ssh *ssh = active_state; /* XXX */
3081+ struct sshbuf *b;
3082+ gss_buffer_desc gssbuf;
3083+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
3084+ OM_uint32 ms;
3085+ int r;
3086+
3087+ static int attempt = 0;
3088+ if (attempt++ >= 1)
3089+ return (0);
3090+
3091+ if (gss_kex_context == NULL) {
3092+ debug("No valid Key exchange context");
3093+ return (0);
3094+ }
3095+
3096+ if ((b = sshbuf_new()) == NULL)
3097+ fatal("%s: sshbuf_new failed", __func__);
3098+ ssh_gssapi_buildmic(b, authctxt->server_user, authctxt->service,
3099+ "gssapi-keyex");
3100+
3101+ if ((gssbuf.value = sshbuf_mutable_ptr(b)) == NULL)
3102+ fatal("%s: sshbuf_mutable_ptr failed", __func__);
3103+ gssbuf.length = sshbuf_len(b);
3104+
3105+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) {
3106+ sshbuf_free(b);
3107+ return (0);
3108+ }
3109+
3110+ if ((r = sshpkt_start(ssh, SSH2_MSG_USERAUTH_REQUEST)) != 0 ||
3111+ (r = sshpkt_put_cstring(ssh, authctxt->server_user)) != 0 ||
3112+ (r = sshpkt_put_cstring(ssh, authctxt->service)) != 0 ||
3113+ (r = sshpkt_put_cstring(ssh, authctxt->method->name)) != 0 ||
3114+ (r = sshpkt_put_string(ssh, mic.value, mic.length)) != 0 ||
3115+ (r = sshpkt_send(ssh)) != 0)
3116+ fatal("%s: %s", __func__, ssh_err(r));
3117+
3118+ sshbuf_free(b);
3119+ gss_release_buffer(&ms, &mic);
3120+
3121+ return (1);
3122+}
3123+
3124 #endif /* GSSAPI */
3125
3126 int
3127diff --git a/sshd.c b/sshd.c
3128index ba26287ba..539a000fd 100644
3129--- a/sshd.c
3130+++ b/sshd.c
3131@@ -123,6 +123,10 @@
3132 #include "version.h"
3133 #include "ssherr.h"
3134
3135+#ifdef USE_SECURITY_SESSION_API
3136+#include <Security/AuthSession.h>
3137+#endif
3138+
3139 /* Re-exec fds */
3140 #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1)
3141 #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2)
3142@@ -1810,10 +1814,13 @@ main(int ac, char **av)
3143 free(fp);
3144 }
3145 accumulate_host_timing_secret(cfg, NULL);
3146+#ifndef GSSAPI
3147+ /* The GSSAPI key exchange can run without a host key */
3148 if (!sensitive_data.have_ssh2_key) {
3149 logit("sshd: no hostkeys available -- exiting.");
3150 exit(1);
3151 }
3152+#endif
3153
3154 /*
3155 * Load certificates. They are stored in an array at identical
3156@@ -2104,6 +2111,60 @@ main(int ac, char **av)
3157 rdomain == NULL ? "" : "\"");
3158 free(laddr);
3159
3160+#ifdef USE_SECURITY_SESSION_API
3161+ /*
3162+ * Create a new security session for use by the new user login if
3163+ * the current session is the root session or we are not launched
3164+ * by inetd (eg: debugging mode or server mode). We do not
3165+ * necessarily need to create a session if we are launched from
3166+ * inetd because Panther xinetd will create a session for us.
3167+ *
3168+ * The only case where this logic will fail is if there is an
3169+ * inetd running in a non-root session which is not creating
3170+ * new sessions for us. Then all the users will end up in the
3171+ * same session (bad).
3172+ *
3173+ * When the client exits, the session will be destroyed for us
3174+ * automatically.
3175+ *
3176+ * We must create the session before any credentials are stored
3177+ * (including AFS pags, which happens a few lines below).
3178+ */
3179+ {
3180+ OSStatus err = 0;
3181+ SecuritySessionId sid = 0;
3182+ SessionAttributeBits sattrs = 0;
3183+
3184+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs);
3185+ if (err)
3186+ error("SessionGetInfo() failed with error %.8X",
3187+ (unsigned) err);
3188+ else
3189+ debug("Current Session ID is %.8X / Session Attributes are %.8X",
3190+ (unsigned) sid, (unsigned) sattrs);
3191+
3192+ if (inetd_flag && !(sattrs & sessionIsRoot))
3193+ debug("Running in inetd mode in a non-root session... "
3194+ "assuming inetd created the session for us.");
3195+ else {
3196+ debug("Creating new security session...");
3197+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote);
3198+ if (err)
3199+ error("SessionCreate() failed with error %.8X",
3200+ (unsigned) err);
3201+
3202+ err = SessionGetInfo(callerSecuritySession, &sid,
3203+ &sattrs);
3204+ if (err)
3205+ error("SessionGetInfo() failed with error %.8X",
3206+ (unsigned) err);
3207+ else
3208+ debug("New Session ID is %.8X / Session Attributes are %.8X",
3209+ (unsigned) sid, (unsigned) sattrs);
3210+ }
3211+ }
3212+#endif
3213+
3214 /*
3215 * We don't want to listen forever unless the other side
3216 * successfully authenticates itself. So we set up an alarm which is
3217@@ -2287,6 +2348,48 @@ do_ssh2_kex(void)
3218 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
3219 list_hostkey_types());
3220
3221+#ifdef GSSAPI
3222+ {
3223+ char *orig;
3224+ char *gss = NULL;
3225+ char *newstr = NULL;
3226+ orig = myproposal[PROPOSAL_KEX_ALGS];
3227+
3228+ /*
3229+ * If we don't have a host key, then there's no point advertising
3230+ * the other key exchange algorithms
3231+ */
3232+
3233+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
3234+ orig = NULL;
3235+
3236+ if (options.gss_keyex)
3237+ gss = ssh_gssapi_server_mechanisms();
3238+ else
3239+ gss = NULL;
3240+
3241+ if (gss && orig)
3242+ xasprintf(&newstr, "%s,%s", gss, orig);
3243+ else if (gss)
3244+ newstr = gss;
3245+ else if (orig)
3246+ newstr = orig;
3247+
3248+ /*
3249+ * If we've got GSSAPI mechanisms, then we've got the 'null' host
3250+ * key alg, but we can't tell people about it unless its the only
3251+ * host key algorithm we support
3252+ */
3253+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0)
3254+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null";
3255+
3256+ if (newstr)
3257+ myproposal[PROPOSAL_KEX_ALGS] = newstr;
3258+ else
3259+ fatal("No supported key exchange algorithms");
3260+ }
3261+#endif
3262+
3263 /* start key exchange */
3264 if ((r = kex_setup(active_state, myproposal)) != 0)
3265 fatal("kex_setup: %s", ssh_err(r));
3266@@ -2304,6 +2407,13 @@ do_ssh2_kex(void)
3267 # endif
3268 #endif
3269 kex->kex[KEX_C25519_SHA256] = kexc25519_server;
3270+#ifdef GSSAPI
3271+ if (options.gss_keyex) {
3272+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
3273+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
3274+ kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server;
3275+ }
3276+#endif
3277 kex->server = 1;
3278 kex->client_version_string=client_version_string;
3279 kex->server_version_string=server_version_string;
3280diff --git a/sshd_config b/sshd_config
3281index 19b7c91a1..2c48105f8 100644
3282--- a/sshd_config
3283+++ b/sshd_config
3284@@ -69,6 +69,8 @@ AuthorizedKeysFile .ssh/authorized_keys
3285 # GSSAPI options
3286 #GSSAPIAuthentication no
3287 #GSSAPICleanupCredentials yes
3288+#GSSAPIStrictAcceptorCheck yes
3289+#GSSAPIKeyExchange no
3290
3291 # Set this to 'yes' to enable PAM authentication, account processing,
3292 # and session processing. If this is enabled, PAM authentication will
3293diff --git a/sshd_config.5 b/sshd_config.5
3294index c6484370b..985eef5a2 100644
3295--- a/sshd_config.5
3296+++ b/sshd_config.5
3297@@ -648,6 +648,11 @@ The default is
3298 Specifies whether user authentication based on GSSAPI is allowed.
3299 The default is
3300 .Cm no .
3301+.It Cm GSSAPIKeyExchange
3302+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange
3303+doesn't rely on ssh keys to verify host identity.
3304+The default is
3305+.Cm no .
3306 .It Cm GSSAPICleanupCredentials
3307 Specifies whether to automatically destroy the user's credentials cache
3308 on logout.
3309@@ -667,6 +672,11 @@ machine's default store.
3310 This facility is provided to assist with operation on multi homed machines.
3311 The default is
3312 .Cm yes .
3313+.It Cm GSSAPIStoreCredentialsOnRekey
3314+Controls whether the user's GSSAPI credentials should be updated following a
3315+successful connection rekeying. This option can be used to accepted renewed
3316+or updated credentials from a compatible client. The default is
3317+.Cm no .
3318 .It Cm HostbasedAcceptedKeyTypes
3319 Specifies the key types that will be accepted for hostbased authentication
3320 as a list of comma-separated patterns.
3321diff --git a/sshkey.c b/sshkey.c
3322index 6555c5ef8..a85c185fc 100644
3323--- a/sshkey.c
3324+++ b/sshkey.c
3325@@ -135,6 +135,7 @@ static const struct keytype keytypes[] = {
3326 # endif /* OPENSSL_HAS_NISTP521 */
3327 # endif /* OPENSSL_HAS_ECC */
3328 #endif /* WITH_OPENSSL */
3329+ { "null", "null", NULL, KEY_NULL, 0, 0, 0 },
3330 { NULL, NULL, NULL, -1, -1, 0, 0 }
3331 };
3332
3333@@ -223,7 +224,7 @@ sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
3334 const struct keytype *kt;
3335
3336 for (kt = keytypes; kt->type != -1; kt++) {
3337- if (kt->name == NULL)
3338+ if (kt->name == NULL || kt->type == KEY_NULL)
3339 continue;
3340 if (!include_sigonly && kt->sigonly)
3341 continue;
3342diff --git a/sshkey.h b/sshkey.h
3343index f6a007fdf..f54deb0c0 100644
3344--- a/sshkey.h
3345+++ b/sshkey.h
3346@@ -64,6 +64,7 @@ enum sshkey_types {
3347 KEY_ED25519_CERT,
3348 KEY_XMSS,
3349 KEY_XMSS_CERT,
3350+ KEY_NULL,
3351 KEY_UNSPEC
3352 };
3353
diff --git a/debian/patches/have-progressmeter-force-update-at-beginning-and-end-transfer.patch b/debian/patches/have-progressmeter-force-update-at-beginning-and-end-transfer.patch
new file mode 100644
index 000000000..767dbf2b5
--- /dev/null
+++ b/debian/patches/have-progressmeter-force-update-at-beginning-and-end-transfer.patch
@@ -0,0 +1,120 @@
1From 2a8f710447442e9a03e71c022859112ec2d77d17 Mon Sep 17 00:00:00 2001
2From: "dtucker@openbsd.org" <dtucker@openbsd.org>
3Date: Thu, 24 Jan 2019 16:52:17 +0000
4Subject: upstream: Have progressmeter force an update at the beginning and
5
6end of each transfer. Fixes the problem recently introduces where very quick
7transfers do not display the progressmeter at all. Spotted by naddy@
8
9OpenBSD-Commit-ID: 68dc46c259e8fdd4f5db3ec2a130f8e4590a7a9a
10
11Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=bdc6c63c80b55bcbaa66b5fde31c1cb1d09a41eb
12Last-Update: 2019-02-08
13
14Patch-Name: have-progressmeter-force-update-at-beginning-and-end-transfer.patch
15---
16 progressmeter.c | 13 +++++--------
17 progressmeter.h | 4 ++--
18 scp.c | 2 +-
19 sftp-client.c | 2 +-
20 4 files changed, 9 insertions(+), 12 deletions(-)
21
22diff --git a/progressmeter.c b/progressmeter.c
23index add462dde..e385c1254 100644
24--- a/progressmeter.c
25+++ b/progressmeter.c
26@@ -1,4 +1,4 @@
27-/* $OpenBSD: progressmeter.c,v 1.46 2019/01/23 08:01:46 dtucker Exp $ */
28+/* $OpenBSD: progressmeter.c,v 1.47 2019/01/24 16:52:17 dtucker Exp $ */
29 /*
30 * Copyright (c) 2003 Nils Nordman. All rights reserved.
31 *
32@@ -59,9 +59,6 @@ static void format_rate(char *, int, off_t);
33 static void sig_winch(int);
34 static void setscreensize(void);
35
36-/* updates the progressmeter to reflect the current state of the transfer */
37-void refresh_progress_meter(void);
38-
39 /* signal handler for updating the progress meter */
40 static void sig_alarm(int);
41
42@@ -120,7 +117,7 @@ format_size(char *buf, int size, off_t bytes)
43 }
44
45 void
46-refresh_progress_meter(void)
47+refresh_progress_meter(int force_update)
48 {
49 char buf[MAX_WINSIZE + 1];
50 off_t transferred;
51@@ -131,7 +128,7 @@ refresh_progress_meter(void)
52 int hours, minutes, seconds;
53 int file_len;
54
55- if ((!alarm_fired && !win_resized) || !can_output())
56+ if ((!force_update && !alarm_fired && !win_resized) || !can_output())
57 return;
58 alarm_fired = 0;
59
60@@ -254,7 +251,7 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr)
61 bytes_per_second = 0;
62
63 setscreensize();
64- refresh_progress_meter();
65+ refresh_progress_meter(1);
66
67 signal(SIGALRM, sig_alarm);
68 signal(SIGWINCH, sig_winch);
69@@ -271,7 +268,7 @@ stop_progress_meter(void)
70
71 /* Ensure we complete the progress */
72 if (cur_pos != end_pos)
73- refresh_progress_meter();
74+ refresh_progress_meter(1);
75
76 atomicio(vwrite, STDOUT_FILENO, "\n", 1);
77 }
78diff --git a/progressmeter.h b/progressmeter.h
79index 8f6678060..1703ea75b 100644
80--- a/progressmeter.h
81+++ b/progressmeter.h
82@@ -1,4 +1,4 @@
83-/* $OpenBSD: progressmeter.h,v 1.4 2019/01/23 08:01:46 dtucker Exp $ */
84+/* $OpenBSD: progressmeter.h,v 1.5 2019/01/24 16:52:17 dtucker Exp $ */
85 /*
86 * Copyright (c) 2002 Nils Nordman. All rights reserved.
87 *
88@@ -24,5 +24,5 @@
89 */
90
91 void start_progress_meter(const char *, off_t, off_t *);
92-void refresh_progress_meter(void);
93+void refresh_progress_meter(int);
94 void stop_progress_meter(void);
95diff --git a/scp.c b/scp.c
96index 80308573c..1971c80cd 100644
97--- a/scp.c
98+++ b/scp.c
99@@ -593,7 +593,7 @@ scpio(void *_cnt, size_t s)
100 off_t *cnt = (off_t *)_cnt;
101
102 *cnt += s;
103- refresh_progress_meter();
104+ refresh_progress_meter(0);
105 if (limit_kbps > 0)
106 bandwidth_limit(&bwlimit, s);
107 return 0;
108diff --git a/sftp-client.c b/sftp-client.c
109index 2bc698f86..cf2887a40 100644
110--- a/sftp-client.c
111+++ b/sftp-client.c
112@@ -101,7 +101,7 @@ sftpio(void *_bwlimit, size_t amount)
113 {
114 struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
115
116- refresh_progress_meter();
117+ refresh_progress_meter(0);
118 if (bwlimit != NULL)
119 bandwidth_limit(bwlimit, amount);
120 return 0;
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
new file mode 100644
index 000000000..4207302c3
--- /dev/null
+++ b/debian/patches/keepalive-extensions.patch
@@ -0,0 +1,134 @@
1From 7ba31c6ff505278fb9f33b695605ca3a093caba2 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: 2018-10-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 5e655e924..052d4b1ac 100644
30--- a/readconf.c
31+++ b/readconf.c
32@@ -175,6 +175,7 @@ typedef enum {
33 oStreamLocalBindMask, oStreamLocalBindUnlink, oRevokedHostKeys,
34 oFingerprintHash, oUpdateHostkeys, oHostbasedKeyTypes,
35 oPubkeyAcceptedKeyTypes, oCASignatureAlgorithms, oProxyJump,
36+ oProtocolKeepAlives, oSetupTimeOut,
37 oIgnore, oIgnoredUnknownOption, oDeprecated, oUnsupported
38 } OpCodes;
39
40@@ -322,6 +323,8 @@ static struct {
41 { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
42 { "ignoreunknown", oIgnoreUnknown },
43 { "proxyjump", oProxyJump },
44+ { "protocolkeepalives", oProtocolKeepAlives },
45+ { "setuptimeout", oSetupTimeOut },
46
47 { NULL, oBadOption }
48 };
49@@ -1415,6 +1418,8 @@ parse_keytypes:
50 goto parse_flag;
51
52 case oServerAliveInterval:
53+ case oProtocolKeepAlives: /* Debian-specific compatibility alias */
54+ case oSetupTimeOut: /* Debian-specific compatibility alias */
55 intptr = &options->server_alive_interval;
56 goto parse_time;
57
58@@ -2101,8 +2106,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 16c79368a..54e143c93 100644
76--- a/ssh_config.5
77+++ b/ssh_config.5
78@@ -247,8 +247,12 @@ Valid arguments are
79 If set to
80 .Cm 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 (Debian-specific).
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 .Cm yes
91 or
92@@ -1485,7 +1489,14 @@ from the server,
93 will send a message through the encrypted
94 channel to request a response from the server.
95 The default
96-is 0, indicating that these messages will not be sent to the server.
97+is 0, indicating that these messages will not be sent to the server,
98+or 300 if the
99+.Cm BatchMode
100+option is set (Debian-specific).
101+.Cm ProtocolKeepAlives
102+and
103+.Cm SetupTimeOut
104+are Debian-specific compatibility aliases for this option.
105 .It Cm SetEnv
106 Directly specify one or more environment variables and their contents to
107 be sent to the server.
108@@ -1565,6 +1576,12 @@ Specifies whether the system should send TCP keepalive messages to the
109 other side.
110 If they are sent, death of the connection or crash of one
111 of the machines will be properly noticed.
112+This option only uses TCP keepalives (as opposed to using ssh level
113+keepalives), so takes a long time to notice when the connection dies.
114+As such, you probably want
115+the
116+.Cm ServerAliveInterval
117+option as well.
118 However, this means that
119 connections will die if the route is down temporarily, and some people
120 find it annoying.
121diff --git a/sshd_config.5 b/sshd_config.5
122index 985eef5a2..e7e55dd71 100644
123--- a/sshd_config.5
124+++ b/sshd_config.5
125@@ -1577,6 +1577,9 @@ This avoids infinitely hanging sessions.
126 .Pp
127 To disable TCP keepalive messages, the value should be set to
128 .Cm no .
129+.Pp
130+This option was formerly called
131+.Cm KeepAlive .
132 .It Cm TrustedUserCAKeys
133 Specifies a file containing public keys of certificate authorities that are
134 trusted to sign user certificates for authentication, or
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
new file mode 100644
index 000000000..75ed46db7
--- /dev/null
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -0,0 +1,44 @@
1From bb8bb2621914ad600202e38d5b9b4f4544b191e5 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
6Author: Chris Lamb <lamby@debian.org>
7Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843
8Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607
9Last-Update: 2017-08-22
10
11Patch-Name: mention-ssh-keygen-on-keychange.patch
12---
13 sshconnect.c | 9 ++++++++-
14 1 file changed, 8 insertions(+), 1 deletion(-)
15
16diff --git a/sshconnect.c b/sshconnect.c
17index 700ea6c3c..158e8146f 100644
18--- a/sshconnect.c
19+++ b/sshconnect.c
20@@ -1121,9 +1121,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
21 error("%s. This could either mean that", key_msg);
22 error("DNS SPOOFING is happening or the IP address for the host");
23 error("and its host key have changed at the same time.");
24- if (ip_status != HOST_NEW)
25+ if (ip_status != HOST_NEW) {
26 error("Offending key for IP in %s:%lu",
27 ip_found->file, ip_found->line);
28+ error(" remove with:");
29+ error(" ssh-keygen -f \"%s\" -R \"%s\"",
30+ ip_found->file, ip);
31+ }
32 }
33 /* The host key has changed. */
34 warn_changed_key(host_key);
35@@ -1132,6 +1136,9 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
36 error("Offending %s key in %s:%lu",
37 sshkey_type(host_found->key),
38 host_found->file, host_found->line);
39+ error(" remove with:");
40+ error(" ssh-keygen -f \"%s\" -R \"%s\"",
41+ host_found->file, host);
42
43 /*
44 * 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..3b2e05e58
--- /dev/null
+++ b/debian/patches/no-openssl-version-status.patch
@@ -0,0 +1,62 @@
1From 690051b3aa4ff72af57e4a82d640858357eef820 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 8b4a36274..ea0b0c9fb 100644
27--- a/openbsd-compat/openssl-compat.c
28+++ b/openbsd-compat/openssl-compat.c
29@@ -34,7 +34,7 @@
30 /*
31 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
32 * We match major, minor, fix and status (not patch) for <1.0.0.
33- * After that, we acceptable compatible fix versions (so we
34+ * After that, we accept compatible fix and status versions (so we
35 * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed
36 * within a patch series.
37 */
38@@ -55,10 +55,10 @@ ssh_compatible_openssl(long headerver, long libver)
39 }
40
41 /*
42- * For versions >= 1.0.0, major,minor,status must match and library
43+ * For versions >= 1.0.0, major,minor must match and library
44 * fix version must be equal to or newer than the header.
45 */
46- mask = 0xfff0000fL; /* major,minor,status */
47+ mask = 0xfff00000L; /* major,minor */
48 hfix = (headerver & 0x000ff000) >> 12;
49 lfix = (libver & 0x000ff000) >> 12;
50 if ( (headerver & mask) == (libver & mask) && lfix >= hfix)
51diff --git a/openbsd-compat/regress/opensslvertest.c b/openbsd-compat/regress/opensslvertest.c
52index 5d019b598..58474873d 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..cdb905b2e
--- /dev/null
+++ b/debian/patches/openbsd-docs.patch
@@ -0,0 +1,148 @@
1From 96c85e746d4f94c7d2748a200e5817ad8a987918 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: 2017-10-04
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 ef0de0850..149846c8c 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 bfa2eb5f3..da6b5ed76 100644
48--- a/ssh-keygen.1
49+++ b/ssh-keygen.1
50@@ -176,9 +176,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@@ -229,9 +227,7 @@ If
62 .Fl f
63 has also been specified, its argument is used as a prefix to the
64 default path for the resulting host key files.
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 private key this option specifies the number of KDF
71 (key derivation function) rounds used.
72@@ -677,7 +673,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@@ -877,7 +873,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 81f29af43..5dfad6daa 100644
92--- a/ssh.1
93+++ b/ssh.1
94@@ -860,6 +860,10 @@ implements public key authentication protocol automatically,
95 using one of the DSA, ECDSA, Ed25519 or RSA algorithms.
96 The HISTORY section of
97 .Xr ssl 8
98+(on non-OpenBSD systems, see
99+.nh
100+http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY)
101+.hy
102 contains a brief discussion of the DSA and RSA algorithms.
103 .Pp
104 The file
105diff --git a/sshd.8 b/sshd.8
106index 57a7fd66b..4abc01d66 100644
107--- a/sshd.8
108+++ b/sshd.8
109@@ -65,7 +65,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@@ -884,7 +884,7 @@ This file is for host-based authentication (see
119 .Xr ssh 1 ) .
120 It should only be writable by root.
121 .Pp
122-.It Pa /etc/moduli
123+.It Pa /etc/ssh/moduli
124 Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
125 key exchange method.
126 The file format is described in
127@@ -982,7 +982,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 37e6be38f..23f71fd1d 100644
137--- a/sshd_config.5
138+++ b/sshd_config.5
139@@ -395,8 +395,7 @@ Certificates signed using other algorithms will not be accepted for
140 public key or host-based authentication.
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 .Cm 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..809c78846
--- /dev/null
+++ b/debian/patches/package-versioning.patch
@@ -0,0 +1,61 @@
1From b258a00bedcf29200b394c671c6deb1e53157f32 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: 2017-10-04
13
14Patch-Name: package-versioning.patch
15---
16 sshconnect.c | 2 +-
17 sshd.c | 2 +-
18 version.h | 7 ++++++-
19 3 files changed, 8 insertions(+), 3 deletions(-)
20
21diff --git a/sshconnect.c b/sshconnect.c
22index 158e8146f..b9418e277 100644
23--- a/sshconnect.c
24+++ b/sshconnect.c
25@@ -609,7 +609,7 @@ send_client_banner(int connection_out, int minor1)
26 {
27 /* Send our own protocol version identification. */
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 if (atomicio(vwrite, connection_out, client_version_string,
32 strlen(client_version_string)) != strlen(client_version_string))
33 fatal("write: %.100s", strerror(errno));
34diff --git a/sshd.c b/sshd.c
35index 2bc6679e5..9481272fc 100644
36--- a/sshd.c
37+++ b/sshd.c
38@@ -384,7 +384,7 @@ sshd_exchange_identification(struct ssh *ssh, int sock_in, int sock_out)
39 char remote_version[256]; /* Must be at least as big as buf. */
40
41 xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s\r\n",
42- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
43+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
44 *options.version_addendum == '\0' ? "" : " ",
45 options.version_addendum);
46
47diff --git a/version.h b/version.h
48index 422dfbc3a..5e1ce0426 100644
49--- a/version.h
50+++ b/version.h
51@@ -3,4 +3,9 @@
52 #define SSH_VERSION "OpenSSH_7.9"
53
54 #define SSH_PORTABLE "p1"
55-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
56+#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE
57+#ifdef SSH_EXTRAVERSION
58+#define SSH_RELEASE SSH_RELEASE_MINIMUM " " SSH_EXTRAVERSION
59+#else
60+#define SSH_RELEASE SSH_RELEASE_MINIMUM
61+#endif
diff --git a/debian/patches/request-rsa-sha2-cert-signatures.patch b/debian/patches/request-rsa-sha2-cert-signatures.patch
new file mode 100644
index 000000000..2c876be31
--- /dev/null
+++ b/debian/patches/request-rsa-sha2-cert-signatures.patch
@@ -0,0 +1,39 @@
1From d94226d4fcefbc398c5583e12b5d07ca33884ba4 Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Thu, 27 Dec 2018 23:02:11 +0000
4Subject: upstream: Request RSA-SHA2 signatures for
5
6rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms; ok markus@
7
8OpenBSD-Commit-ID: afc6f7ca216ccd821656d1c911d2a3deed685033
9
10Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=f429c1b2ef631f2855e51a790cf71761d752bbca
11Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2944
12Bug-Debian: https://bugs.debian.org/923419
13Last-Update: 2019-02-28
14
15Patch-Name: request-rsa-sha2-cert-signatures.patch
16---
17 authfd.c | 8 +++++---
18 1 file changed, 5 insertions(+), 3 deletions(-)
19
20diff --git a/authfd.c b/authfd.c
21index ecdd869ab..62cbf8c19 100644
22--- a/authfd.c
23+++ b/authfd.c
24@@ -327,10 +327,12 @@ ssh_free_identitylist(struct ssh_identitylist *idl)
25 static u_int
26 agent_encode_alg(const struct sshkey *key, const char *alg)
27 {
28- if (alg != NULL && key->type == KEY_RSA) {
29- if (strcmp(alg, "rsa-sha2-256") == 0)
30+ if (alg != NULL && sshkey_type_plain(key->type) == KEY_RSA) {
31+ if (strcmp(alg, "rsa-sha2-256") == 0 ||
32+ strcmp(alg, "rsa-sha2-256-cert-v01@openssh.com") == 0)
33 return SSH_AGENT_RSA_SHA2_256;
34- else if (strcmp(alg, "rsa-sha2-512") == 0)
35+ if (strcmp(alg, "rsa-sha2-512") == 0 ||
36+ strcmp(alg, "rsa-sha2-512-cert-v01@openssh.com") == 0)
37 return SSH_AGENT_RSA_SHA2_512;
38 }
39 return 0;
diff --git a/debian/patches/restore-authorized_keys2.patch b/debian/patches/restore-authorized_keys2.patch
new file mode 100644
index 000000000..fcb1ac7e3
--- /dev/null
+++ b/debian/patches/restore-authorized_keys2.patch
@@ -0,0 +1,35 @@
1From cebe4b82b280810172877a7f3d489c506c9a0691 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 5 Mar 2017 02:02:11 +0000
4Subject: Restore reading authorized_keys2 by default
5
6Upstream seems to intend to gradually phase this out, so don't assume
7that this will remain the default forever. However, we were late in
8adopting the upstream sshd_config changes, so it makes sense to extend
9the grace period.
10
11Bug-Debian: https://bugs.debian.org/852320
12Forwarded: not-needed
13Last-Update: 2017-03-05
14
15Patch-Name: restore-authorized_keys2.patch
16---
17 sshd_config | 5 ++---
18 1 file changed, 2 insertions(+), 3 deletions(-)
19
20diff --git a/sshd_config b/sshd_config
21index ed8272f6d..ee9629102 100644
22--- a/sshd_config
23+++ b/sshd_config
24@@ -36,9 +36,8 @@
25
26 #PubkeyAuthentication yes
27
28-# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2
29-# but this is overridden so installations will only check .ssh/authorized_keys
30-AuthorizedKeysFile .ssh/authorized_keys
31+# Expect .ssh/authorized_keys2 to be disregarded by default in future.
32+#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2
33
34 #AuthorizedPrincipalsFile none
35
diff --git a/debian/patches/restore-tcp-wrappers.patch b/debian/patches/restore-tcp-wrappers.patch
new file mode 100644
index 000000000..fdc6cf18a
--- /dev/null
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -0,0 +1,172 @@
1From 389e16d0109d8c49a761cd7c267438b05c9ab984 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: 2018-08-24
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 023e7cc55..917300b43 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -1517,6 +1517,62 @@ else
35 AC_MSG_RESULT([no])
36 fi
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@@ -5329,6 +5385,7 @@ echo " PAM support: $PAM_MSG"
98 echo " OSF SIA support: $SIA_MSG"
99 echo " KerberosV support: $KRB5_MSG"
100 echo " SELinux support: $SELINUX_MSG"
101+echo " TCP Wrappers support: $TCPW_MSG"
102 echo " MD5 password support: $MD5_MSG"
103 echo " libedit support: $LIBEDIT_MSG"
104 echo " libldns support: $LDNS_MSG"
105diff --git a/sshd.8 b/sshd.8
106index fb133c14b..57a7fd66b 100644
107--- a/sshd.8
108+++ b/sshd.8
109@@ -873,6 +873,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@@ -975,6 +981,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 539a000fd..673db87f6 100644
132--- a/sshd.c
133+++ b/sshd.c
134@@ -127,6 +127,13 @@
135 #include <Security/AuthSession.h>
136 #endif
137
138+#ifdef LIBWRAP
139+#include <tcpd.h>
140+#include <syslog.h>
141+int allow_severity;
142+int deny_severity;
143+#endif /* LIBWRAP */
144+
145 /* Re-exec fds */
146 #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1)
147 #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2)
148@@ -2099,6 +2106,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 rdomain = ssh_packet_rdomain_in(ssh);
172
diff --git a/debian/patches/sanitize-scp-filenames-via-snmprintf.patch b/debian/patches/sanitize-scp-filenames-via-snmprintf.patch
new file mode 100644
index 000000000..e58b8b1bd
--- /dev/null
+++ b/debian/patches/sanitize-scp-filenames-via-snmprintf.patch
@@ -0,0 +1,276 @@
1From 11b88754cadcad0ba79b4ffcc127223248dccb54 Mon Sep 17 00:00:00 2001
2From: "dtucker@openbsd.org" <dtucker@openbsd.org>
3Date: Wed, 23 Jan 2019 08:01:46 +0000
4Subject: upstream: Sanitize scp filenames via snmprintf. To do this we move
5
6the progressmeter formatting outside of signal handler context and have the
7atomicio callback called for EINTR too. bz#2434 with contributions from djm
8and jjelen at redhat.com, ok djm@
9
10OpenBSD-Commit-ID: 1af61c1f70e4f3bd8ab140b9f1fa699481db57d8
11
12CVE-2019-6109
13
14Origin: backport, https://anongit.mindrot.org/openssh.git/commit/?id=8976f1c4b2721c26e878151f52bdf346dfe2d54c
15Bug-Debian: https://bugs.debian.org/793412
16Last-Update: 2019-02-08
17
18Patch-Name: sanitize-scp-filenames-via-snmprintf.patch
19---
20 atomicio.c | 20 ++++++++++++++-----
21 progressmeter.c | 53 ++++++++++++++++++++++---------------------------
22 progressmeter.h | 3 ++-
23 scp.c | 1 +
24 sftp-client.c | 16 ++++++++-------
25 5 files changed, 51 insertions(+), 42 deletions(-)
26
27diff --git a/atomicio.c b/atomicio.c
28index f854a06f5..d91bd7621 100644
29--- a/atomicio.c
30+++ b/atomicio.c
31@@ -1,4 +1,4 @@
32-/* $OpenBSD: atomicio.c,v 1.28 2016/07/27 23:18:12 djm Exp $ */
33+/* $OpenBSD: atomicio.c,v 1.29 2019/01/23 08:01:46 dtucker Exp $ */
34 /*
35 * Copyright (c) 2006 Damien Miller. All rights reserved.
36 * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
37@@ -65,9 +65,14 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n,
38 res = (f) (fd, s + pos, n - pos);
39 switch (res) {
40 case -1:
41- if (errno == EINTR)
42+ if (errno == EINTR) {
43+ /* possible SIGALARM, update callback */
44+ if (cb != NULL && cb(cb_arg, 0) == -1) {
45+ errno = EINTR;
46+ return pos;
47+ }
48 continue;
49- if (errno == EAGAIN || errno == EWOULDBLOCK) {
50+ } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
51 #ifndef BROKEN_READ_COMPARISON
52 (void)poll(&pfd, 1, -1);
53 #endif
54@@ -122,9 +127,14 @@ atomiciov6(ssize_t (*f) (int, const struct iovec *, int), int fd,
55 res = (f) (fd, iov, iovcnt);
56 switch (res) {
57 case -1:
58- if (errno == EINTR)
59+ if (errno == EINTR) {
60+ /* possible SIGALARM, update callback */
61+ if (cb != NULL && cb(cb_arg, 0) == -1) {
62+ errno = EINTR;
63+ return pos;
64+ }
65 continue;
66- if (errno == EAGAIN || errno == EWOULDBLOCK) {
67+ } else if (errno == EAGAIN || errno == EWOULDBLOCK) {
68 #ifndef BROKEN_READV_COMPARISON
69 (void)poll(&pfd, 1, -1);
70 #endif
71diff --git a/progressmeter.c b/progressmeter.c
72index fe9bf52e4..add462dde 100644
73--- a/progressmeter.c
74+++ b/progressmeter.c
75@@ -1,4 +1,4 @@
76-/* $OpenBSD: progressmeter.c,v 1.45 2016/06/30 05:17:05 dtucker Exp $ */
77+/* $OpenBSD: progressmeter.c,v 1.46 2019/01/23 08:01:46 dtucker Exp $ */
78 /*
79 * Copyright (c) 2003 Nils Nordman. All rights reserved.
80 *
81@@ -31,6 +31,7 @@
82
83 #include <errno.h>
84 #include <signal.h>
85+#include <stdarg.h>
86 #include <stdio.h>
87 #include <string.h>
88 #include <time.h>
89@@ -39,6 +40,7 @@
90 #include "progressmeter.h"
91 #include "atomicio.h"
92 #include "misc.h"
93+#include "utf8.h"
94
95 #define DEFAULT_WINSIZE 80
96 #define MAX_WINSIZE 512
97@@ -61,7 +63,7 @@ static void setscreensize(void);
98 void refresh_progress_meter(void);
99
100 /* signal handler for updating the progress meter */
101-static void update_progress_meter(int);
102+static void sig_alarm(int);
103
104 static double start; /* start progress */
105 static double last_update; /* last progress update */
106@@ -74,6 +76,7 @@ static long stalled; /* how long we have been stalled */
107 static int bytes_per_second; /* current speed in bytes per second */
108 static int win_size; /* terminal window size */
109 static volatile sig_atomic_t win_resized; /* for window resizing */
110+static volatile sig_atomic_t alarm_fired;
111
112 /* units for format_size */
113 static const char unit[] = " KMGT";
114@@ -126,9 +129,17 @@ refresh_progress_meter(void)
115 off_t bytes_left;
116 int cur_speed;
117 int hours, minutes, seconds;
118- int i, len;
119 int file_len;
120
121+ if ((!alarm_fired && !win_resized) || !can_output())
122+ return;
123+ alarm_fired = 0;
124+
125+ if (win_resized) {
126+ setscreensize();
127+ win_resized = 0;
128+ }
129+
130 transferred = *counter - (cur_pos ? cur_pos : start_pos);
131 cur_pos = *counter;
132 now = monotime_double();
133@@ -158,16 +169,11 @@ refresh_progress_meter(void)
134
135 /* filename */
136 buf[0] = '\0';
137- file_len = win_size - 35;
138+ file_len = win_size - 36;
139 if (file_len > 0) {
140- len = snprintf(buf, file_len + 1, "\r%s", file);
141- if (len < 0)
142- len = 0;
143- if (len >= file_len + 1)
144- len = file_len;
145- for (i = len; i < file_len; i++)
146- buf[i] = ' ';
147- buf[file_len] = '\0';
148+ buf[0] = '\r';
149+ snmprintf(buf+1, sizeof(buf)-1 , &file_len, "%*s",
150+ file_len * -1, file);
151 }
152
153 /* percent of transfer done */
154@@ -228,22 +234,11 @@ refresh_progress_meter(void)
155
156 /*ARGSUSED*/
157 static void
158-update_progress_meter(int ignore)
159+sig_alarm(int ignore)
160 {
161- int save_errno;
162-
163- save_errno = errno;
164-
165- if (win_resized) {
166- setscreensize();
167- win_resized = 0;
168- }
169- if (can_output())
170- refresh_progress_meter();
171-
172- signal(SIGALRM, update_progress_meter);
173+ signal(SIGALRM, sig_alarm);
174+ alarm_fired = 1;
175 alarm(UPDATE_INTERVAL);
176- errno = save_errno;
177 }
178
179 void
180@@ -259,10 +254,9 @@ start_progress_meter(const char *f, off_t filesize, off_t *ctr)
181 bytes_per_second = 0;
182
183 setscreensize();
184- if (can_output())
185- refresh_progress_meter();
186+ refresh_progress_meter();
187
188- signal(SIGALRM, update_progress_meter);
189+ signal(SIGALRM, sig_alarm);
190 signal(SIGWINCH, sig_winch);
191 alarm(UPDATE_INTERVAL);
192 }
193@@ -286,6 +280,7 @@ stop_progress_meter(void)
194 static void
195 sig_winch(int sig)
196 {
197+ signal(SIGWINCH, sig_winch);
198 win_resized = 1;
199 }
200
201diff --git a/progressmeter.h b/progressmeter.h
202index bf179dca6..8f6678060 100644
203--- a/progressmeter.h
204+++ b/progressmeter.h
205@@ -1,4 +1,4 @@
206-/* $OpenBSD: progressmeter.h,v 1.3 2015/01/14 13:54:13 djm Exp $ */
207+/* $OpenBSD: progressmeter.h,v 1.4 2019/01/23 08:01:46 dtucker Exp $ */
208 /*
209 * Copyright (c) 2002 Nils Nordman. All rights reserved.
210 *
211@@ -24,4 +24,5 @@
212 */
213
214 void start_progress_meter(const char *, off_t, off_t *);
215+void refresh_progress_meter(void);
216 void stop_progress_meter(void);
217diff --git a/scp.c b/scp.c
218index 7163d33dc..80308573c 100644
219--- a/scp.c
220+++ b/scp.c
221@@ -593,6 +593,7 @@ scpio(void *_cnt, size_t s)
222 off_t *cnt = (off_t *)_cnt;
223
224 *cnt += s;
225+ refresh_progress_meter();
226 if (limit_kbps > 0)
227 bandwidth_limit(&bwlimit, s);
228 return 0;
229diff --git a/sftp-client.c b/sftp-client.c
230index 4986d6d8d..2bc698f86 100644
231--- a/sftp-client.c
232+++ b/sftp-client.c
233@@ -101,7 +101,9 @@ sftpio(void *_bwlimit, size_t amount)
234 {
235 struct bwlimit *bwlimit = (struct bwlimit *)_bwlimit;
236
237- bandwidth_limit(bwlimit, amount);
238+ refresh_progress_meter();
239+ if (bwlimit != NULL)
240+ bandwidth_limit(bwlimit, amount);
241 return 0;
242 }
243
244@@ -121,8 +123,8 @@ send_msg(struct sftp_conn *conn, struct sshbuf *m)
245 iov[1].iov_base = (u_char *)sshbuf_ptr(m);
246 iov[1].iov_len = sshbuf_len(m);
247
248- if (atomiciov6(writev, conn->fd_out, iov, 2,
249- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_out) !=
250+ if (atomiciov6(writev, conn->fd_out, iov, 2, sftpio,
251+ conn->limit_kbps > 0 ? &conn->bwlimit_out : NULL) !=
252 sshbuf_len(m) + sizeof(mlen))
253 fatal("Couldn't send packet: %s", strerror(errno));
254
255@@ -138,8 +140,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
256
257 if ((r = sshbuf_reserve(m, 4, &p)) != 0)
258 fatal("%s: buffer error: %s", __func__, ssh_err(r));
259- if (atomicio6(read, conn->fd_in, p, 4,
260- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in) != 4) {
261+ if (atomicio6(read, conn->fd_in, p, 4, sftpio,
262+ conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL) != 4) {
263 if (errno == EPIPE || errno == ECONNRESET)
264 fatal("Connection closed");
265 else
266@@ -157,8 +159,8 @@ get_msg_extended(struct sftp_conn *conn, struct sshbuf *m, int initial)
267
268 if ((r = sshbuf_reserve(m, msg_len, &p)) != 0)
269 fatal("%s: buffer error: %s", __func__, ssh_err(r));
270- if (atomicio6(read, conn->fd_in, p, msg_len,
271- conn->limit_kbps > 0 ? sftpio : NULL, &conn->bwlimit_in)
272+ if (atomicio6(read, conn->fd_in, p, msg_len, sftpio,
273+ conn->limit_kbps > 0 ? &conn->bwlimit_in : NULL)
274 != msg_len) {
275 if (errno == EPIPE)
276 fatal("Connection closed");
diff --git a/debian/patches/scp-disallow-dot-or-empty-filename.patch b/debian/patches/scp-disallow-dot-or-empty-filename.patch
new file mode 100644
index 000000000..716f2ffa8
--- /dev/null
+++ b/debian/patches/scp-disallow-dot-or-empty-filename.patch
@@ -0,0 +1,32 @@
1From dee21e97428e69d30e2d15c71f3e7cc08bf8e4f8 Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Fri, 16 Nov 2018 03:03:10 +0000
4Subject: upstream: disallow empty incoming filename or ones that refer to the
5
6current directory; based on report/patch from Harry Sintonen
7
8OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9
9
10Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=6010c0303a422a9c5fa8860c061bf7105eb7f8b2
11Bug-Debian: https://bugs.debian.org/919101
12Last-Update: 2019-01-12
13
14Patch-Name: scp-disallow-dot-or-empty-filename.patch
15---
16 scp.c | 3 ++-
17 1 file changed, 2 insertions(+), 1 deletion(-)
18
19diff --git a/scp.c b/scp.c
20index ed2864250..7163d33dc 100644
21--- a/scp.c
22+++ b/scp.c
23@@ -1114,7 +1114,8 @@ sink(int argc, char **argv)
24 SCREWUP("size out of range");
25 size = (off_t)ull;
26
27- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
28+ if (*cp == '\0' || strchr(cp, '/') != NULL ||
29+ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
30 run_err("error: unexpected filename: %s", cp);
31 exit(1);
32 }
diff --git a/debian/patches/scp-handle-braces.patch b/debian/patches/scp-handle-braces.patch
new file mode 100644
index 000000000..0cbdcfdc0
--- /dev/null
+++ b/debian/patches/scp-handle-braces.patch
@@ -0,0 +1,353 @@
1From 7a3fa37583d4abf128f7f4c6eb1e7ffc90115eab Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Sun, 10 Feb 2019 11:15:52 +0000
4Subject: upstream: when checking that filenames sent by the server side
5
6match what the client requested, be prepared to handle shell-style brace
7alternations, e.g. "{foo,bar}".
8
9"looks good to me" millert@ + in snaps for the last week courtesy
10deraadt@
11
12OpenBSD-Commit-ID: 3b1ce7639b0b25b2248e3a30f561a548f6815f3e
13
14Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=3d896c157c722bc47adca51a58dca859225b5874
15Bug-Debian: https://bugs.debian.org/923486
16Last-Update: 2019-03-01
17
18Patch-Name: scp-handle-braces.patch
19---
20 scp.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
21 1 file changed, 269 insertions(+), 11 deletions(-)
22
23diff --git a/scp.c b/scp.c
24index 035037bcc..3888baab0 100644
25--- a/scp.c
26+++ b/scp.c
27@@ -635,6 +635,253 @@ parse_scp_uri(const char *uri, char **userp, char **hostp, int *portp,
28 return r;
29 }
30
31+/* Appends a string to an array; returns 0 on success, -1 on alloc failure */
32+static int
33+append(char *cp, char ***ap, size_t *np)
34+{
35+ char **tmp;
36+
37+ if ((tmp = reallocarray(*ap, *np + 1, sizeof(*tmp))) == NULL)
38+ return -1;
39+ tmp[(*np)] = cp;
40+ (*np)++;
41+ *ap = tmp;
42+ return 0;
43+}
44+
45+/*
46+ * Finds the start and end of the first brace pair in the pattern.
47+ * returns 0 on success or -1 for invalid patterns.
48+ */
49+static int
50+find_brace(const char *pattern, int *startp, int *endp)
51+{
52+ int i;
53+ int in_bracket, brace_level;
54+
55+ *startp = *endp = -1;
56+ in_bracket = brace_level = 0;
57+ for (i = 0; i < INT_MAX && *endp < 0 && pattern[i] != '\0'; i++) {
58+ switch (pattern[i]) {
59+ case '\\':
60+ /* skip next character */
61+ if (pattern[i + 1] != '\0')
62+ i++;
63+ break;
64+ case '[':
65+ in_bracket = 1;
66+ break;
67+ case ']':
68+ in_bracket = 0;
69+ break;
70+ case '{':
71+ if (in_bracket)
72+ break;
73+ if (pattern[i + 1] == '}') {
74+ /* Protect a single {}, for find(1), like csh */
75+ i++; /* skip */
76+ break;
77+ }
78+ if (*startp == -1)
79+ *startp = i;
80+ brace_level++;
81+ break;
82+ case '}':
83+ if (in_bracket)
84+ break;
85+ if (*startp < 0) {
86+ /* Unbalanced brace */
87+ return -1;
88+ }
89+ if (--brace_level <= 0)
90+ *endp = i;
91+ break;
92+ }
93+ }
94+ /* unbalanced brackets/braces */
95+ if (*endp < 0 && (*startp >= 0 || in_bracket))
96+ return -1;
97+ return 0;
98+}
99+
100+/*
101+ * Assembles and records a successfully-expanded pattern, returns -1 on
102+ * alloc failure.
103+ */
104+static int
105+emit_expansion(const char *pattern, int brace_start, int brace_end,
106+ int sel_start, int sel_end, char ***patternsp, size_t *npatternsp)
107+{
108+ char *cp;
109+ int o = 0, tail_len = strlen(pattern + brace_end + 1);
110+
111+ if ((cp = malloc(brace_start + (sel_end - sel_start) +
112+ tail_len + 1)) == NULL)
113+ return -1;
114+
115+ /* Pattern before initial brace */
116+ if (brace_start > 0) {
117+ memcpy(cp, pattern, brace_start);
118+ o = brace_start;
119+ }
120+ /* Current braced selection */
121+ if (sel_end - sel_start > 0) {
122+ memcpy(cp + o, pattern + sel_start,
123+ sel_end - sel_start);
124+ o += sel_end - sel_start;
125+ }
126+ /* Remainder of pattern after closing brace */
127+ if (tail_len > 0) {
128+ memcpy(cp + o, pattern + brace_end + 1, tail_len);
129+ o += tail_len;
130+ }
131+ cp[o] = '\0';
132+ if (append(cp, patternsp, npatternsp) != 0) {
133+ free(cp);
134+ return -1;
135+ }
136+ return 0;
137+}
138+
139+/*
140+ * Expand the first encountered brace in pattern, appending the expanded
141+ * patterns it yielded to the *patternsp array.
142+ *
143+ * Returns 0 on success or -1 on allocation failure.
144+ *
145+ * Signals whether expansion was performed via *expanded and whether
146+ * pattern was invalid via *invalid.
147+ */
148+static int
149+brace_expand_one(const char *pattern, char ***patternsp, size_t *npatternsp,
150+ int *expanded, int *invalid)
151+{
152+ int i;
153+ int in_bracket, brace_start, brace_end, brace_level;
154+ int sel_start, sel_end;
155+
156+ *invalid = *expanded = 0;
157+
158+ if (find_brace(pattern, &brace_start, &brace_end) != 0) {
159+ *invalid = 1;
160+ return 0;
161+ } else if (brace_start == -1)
162+ return 0;
163+
164+ in_bracket = brace_level = 0;
165+ for (i = sel_start = brace_start + 1; i < brace_end; i++) {
166+ switch (pattern[i]) {
167+ case '{':
168+ if (in_bracket)
169+ break;
170+ brace_level++;
171+ break;
172+ case '}':
173+ if (in_bracket)
174+ break;
175+ brace_level--;
176+ break;
177+ case '[':
178+ in_bracket = 1;
179+ break;
180+ case ']':
181+ in_bracket = 0;
182+ break;
183+ case '\\':
184+ if (i < brace_end - 1)
185+ i++; /* skip */
186+ break;
187+ }
188+ if (pattern[i] == ',' || i == brace_end - 1) {
189+ if (in_bracket || brace_level > 0)
190+ continue;
191+ /* End of a selection, emit an expanded pattern */
192+
193+ /* Adjust end index for last selection */
194+ sel_end = (i == brace_end - 1) ? brace_end : i;
195+ if (emit_expansion(pattern, brace_start, brace_end,
196+ sel_start, sel_end, patternsp, npatternsp) != 0)
197+ return -1;
198+ /* move on to the next selection */
199+ sel_start = i + 1;
200+ continue;
201+ }
202+ }
203+ if (in_bracket || brace_level > 0) {
204+ *invalid = 1;
205+ return 0;
206+ }
207+ /* success */
208+ *expanded = 1;
209+ return 0;
210+}
211+
212+/* Expand braces from pattern. Returns 0 on success, -1 on failure */
213+static int
214+brace_expand(const char *pattern, char ***patternsp, size_t *npatternsp)
215+{
216+ char *cp, *cp2, **active = NULL, **done = NULL;
217+ size_t i, nactive = 0, ndone = 0;
218+ int ret = -1, invalid = 0, expanded = 0;
219+
220+ *patternsp = NULL;
221+ *npatternsp = 0;
222+
223+ /* Start the worklist with the original pattern */
224+ if ((cp = strdup(pattern)) == NULL)
225+ return -1;
226+ if (append(cp, &active, &nactive) != 0) {
227+ free(cp);
228+ return -1;
229+ }
230+ while (nactive > 0) {
231+ cp = active[nactive - 1];
232+ nactive--;
233+ if (brace_expand_one(cp, &active, &nactive,
234+ &expanded, &invalid) == -1) {
235+ free(cp);
236+ goto fail;
237+ }
238+ if (invalid)
239+ fatal("%s: invalid brace pattern \"%s\"", __func__, cp);
240+ if (expanded) {
241+ /*
242+ * Current entry expanded to new entries on the
243+ * active list; discard the progenitor pattern.
244+ */
245+ free(cp);
246+ continue;
247+ }
248+ /*
249+ * Pattern did not expand; append the finename component to
250+ * the completed list
251+ */
252+ if ((cp2 = strrchr(cp, '/')) != NULL)
253+ *cp2++ = '\0';
254+ else
255+ cp2 = cp;
256+ if (append(xstrdup(cp2), &done, &ndone) != 0) {
257+ free(cp);
258+ goto fail;
259+ }
260+ free(cp);
261+ }
262+ /* success */
263+ *patternsp = done;
264+ *npatternsp = ndone;
265+ done = NULL;
266+ ndone = 0;
267+ ret = 0;
268+ fail:
269+ for (i = 0; i < nactive; i++)
270+ free(active[i]);
271+ free(active);
272+ for (i = 0; i < ndone; i++)
273+ free(done[i]);
274+ free(done);
275+ return ret;
276+}
277+
278 void
279 toremote(int argc, char **argv)
280 {
281@@ -998,7 +1245,8 @@ sink(int argc, char **argv, const char *src)
282 unsigned long long ull;
283 int setimes, targisdir, wrerrno = 0;
284 char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048];
285- char *src_copy = NULL, *restrict_pattern = NULL;
286+ char **patterns = NULL;
287+ size_t n, npatterns = 0;
288 struct timeval tv[2];
289
290 #define atime tv[0]
291@@ -1028,16 +1276,13 @@ sink(int argc, char **argv, const char *src)
292 * Prepare to try to restrict incoming filenames to match
293 * the requested destination file glob.
294 */
295- if ((src_copy = strdup(src)) == NULL)
296- fatal("strdup failed");
297- if ((restrict_pattern = strrchr(src_copy, '/')) != NULL) {
298- *restrict_pattern++ = '\0';
299- }
300+ if (brace_expand(src, &patterns, &npatterns) != 0)
301+ fatal("%s: could not expand pattern", __func__);
302 }
303 for (first = 1;; first = 0) {
304 cp = buf;
305 if (atomicio(read, remin, cp, 1) != 1)
306- return;
307+ goto done;
308 if (*cp++ == '\n')
309 SCREWUP("unexpected <newline>");
310 do {
311@@ -1063,7 +1308,7 @@ sink(int argc, char **argv, const char *src)
312 }
313 if (buf[0] == 'E') {
314 (void) atomicio(vwrite, remout, "", 1);
315- return;
316+ goto done;
317 }
318 if (ch == '\n')
319 *--cp = 0;
320@@ -1138,9 +1383,14 @@ sink(int argc, char **argv, const char *src)
321 run_err("error: unexpected filename: %s", cp);
322 exit(1);
323 }
324- if (restrict_pattern != NULL &&
325- fnmatch(restrict_pattern, cp, 0) != 0)
326- SCREWUP("filename does not match request");
327+ if (npatterns > 0) {
328+ for (n = 0; n < npatterns; n++) {
329+ if (fnmatch(patterns[n], cp, 0) == 0)
330+ break;
331+ }
332+ if (n >= npatterns)
333+ SCREWUP("filename does not match request");
334+ }
335 if (targisdir) {
336 static char *namebuf;
337 static size_t cursize;
338@@ -1299,7 +1549,15 @@ bad: run_err("%s: %s", np, strerror(errno));
339 break;
340 }
341 }
342+done:
343+ for (n = 0; n < npatterns; n++)
344+ free(patterns[n]);
345+ free(patterns);
346+ return;
347 screwup:
348+ for (n = 0; n < npatterns; n++)
349+ free(patterns[n]);
350+ free(patterns);
351 run_err("protocol error: %s", why);
352 exit(1);
353 }
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch
new file mode 100644
index 000000000..d054b2a82
--- /dev/null
+++ b/debian/patches/scp-quoting.patch
@@ -0,0 +1,41 @@
1From eefdc7046766b52e39f1b6eafcde22c1e013ce9f 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 60682c687..ed2864250 100644
21--- a/scp.c
22+++ b/scp.c
23@@ -198,8 +198,16 @@ do_local_cmd(arglist *a)
24
25 if (verbose_mode) {
26 fprintf(stderr, "Executing:");
27- for (i = 0; i < a->num; i++)
28- fmprintf(stderr, " %s", a->list[i]);
29+ for (i = 0; i < a->num; i++) {
30+ if (i == 0)
31+ fmprintf(stderr, " %s", a->list[i]);
32+ else
33+ /*
34+ * TODO: misbehaves if a->list[i] contains a
35+ * single quote
36+ */
37+ fmprintf(stderr, " '%s'", a->list[i]);
38+ }
39 fprintf(stderr, "\n");
40 }
41 if ((pid = fork()) == -1)
diff --git a/debian/patches/seccomp-s390-flock-ipc.patch b/debian/patches/seccomp-s390-flock-ipc.patch
new file mode 100644
index 000000000..e864427bd
--- /dev/null
+++ b/debian/patches/seccomp-s390-flock-ipc.patch
@@ -0,0 +1,47 @@
1From 690939ba320d93e6f3ab5266bea94d8fb06c8bae Mon Sep 17 00:00:00 2001
2From: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
3Date: Tue, 9 May 2017 10:53:04 -0300
4Subject: Allow flock and ipc syscall for s390 architecture
5
6In order to use the OpenSSL-ibmpkcs11 engine it is needed to allow flock
7and ipc calls, because this engine calls OpenCryptoki (a PKCS#11
8implementation) which calls the libraries that will communicate with the
9crypto cards. OpenCryptoki makes use of flock and ipc and, as of now,
10this is only need on s390 architecture.
11
12Signed-off-by: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
13
14Origin: other, https://bugzilla.mindrot.org/show_bug.cgi?id=2752
15Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2752
16Bug-Ubuntu: https://bugs.launchpad.net/bugs/1686618
17Last-Update: 2018-10-19
18
19Patch-Name: seccomp-s390-flock-ipc.patch
20---
21 sandbox-seccomp-filter.c | 6 ++++++
22 1 file changed, 6 insertions(+)
23
24diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
25index 5edbc6946..d4bc20828 100644
26--- a/sandbox-seccomp-filter.c
27+++ b/sandbox-seccomp-filter.c
28@@ -166,6 +166,9 @@ static const struct sock_filter preauth_insns[] = {
29 #ifdef __NR_exit_group
30 SC_ALLOW(__NR_exit_group),
31 #endif
32+#if defined(__NR_flock) && defined(__s390__)
33+ SC_ALLOW(__NR_flock),
34+#endif
35 #ifdef __NR_futex
36 SC_ALLOW(__NR_futex),
37 #endif
38@@ -193,6 +196,9 @@ static const struct sock_filter preauth_insns[] = {
39 #ifdef __NR_getuid32
40 SC_ALLOW(__NR_getuid32),
41 #endif
42+#if defined(__NR_ipc) && defined(__s390__)
43+ SC_ALLOW(__NR_ipc),
44+#endif
45 #ifdef __NR_madvise
46 SC_ALLOW(__NR_madvise),
47 #endif
diff --git a/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch b/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch
new file mode 100644
index 000000000..ecbe1d142
--- /dev/null
+++ b/debian/patches/seccomp-s390-ioctl-ep11-crypto.patch
@@ -0,0 +1,33 @@
1From 9ce189b9f22890421b7f8d3f49a39186d3ce3e14 Mon Sep 17 00:00:00 2001
2From: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
3Date: Tue, 9 May 2017 13:33:30 -0300
4Subject: Enable specific ioctl call for EP11 crypto card (s390)
5
6The EP11 crypto card needs to make an ioctl call, which receives an
7specific argument. This crypto card is for s390 only.
8
9Signed-off-by: Eduardo Barretto <ebarretto@linux.vnet.ibm.com>
10
11Origin: other, https://bugzilla.mindrot.org/show_bug.cgi?id=2752
12Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2752
13Bug-Ubuntu: https://bugs.launchpad.net/bugs/1686618
14Last-Update: 2017-08-28
15
16Patch-Name: seccomp-s390-ioctl-ep11-crypto.patch
17---
18 sandbox-seccomp-filter.c | 2 ++
19 1 file changed, 2 insertions(+)
20
21diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
22index d4bc20828..ef4de8c65 100644
23--- a/sandbox-seccomp-filter.c
24+++ b/sandbox-seccomp-filter.c
25@@ -256,6 +256,8 @@ static const struct sock_filter preauth_insns[] = {
26 SC_ALLOW_ARG(__NR_ioctl, 1, Z90STAT_STATUS_MASK),
27 SC_ALLOW_ARG(__NR_ioctl, 1, ICARSAMODEXPO),
28 SC_ALLOW_ARG(__NR_ioctl, 1, ICARSACRT),
29+ /* Allow ioctls for EP11 crypto card on s390 */
30+ SC_ALLOW_ARG(__NR_ioctl, 1, ZSENDEP11CPRB),
31 #endif
32 #if defined(__x86_64__) && defined(__ILP32__) && defined(__X32_SYSCALL_BIT)
33 /*
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch
new file mode 100644
index 000000000..269a87c76
--- /dev/null
+++ b/debian/patches/selinux-role.patch
@@ -0,0 +1,472 @@
1From cf3f6ac19812e4d32874304b3854b055831c2124 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: 2018-08-24
13
14Patch-Name: selinux-role.patch
15---
16 auth.h | 1 +
17 auth2.c | 10 ++++++++--
18 monitor.c | 37 +++++++++++++++++++++++++++++++++----
19 monitor.h | 2 ++
20 monitor_wrap.c | 27 ++++++++++++++++++++++++---
21 monitor_wrap.h | 3 ++-
22 openbsd-compat/port-linux.c | 21 ++++++++++++++-------
23 openbsd-compat/port-linux.h | 4 ++--
24 platform.c | 4 ++--
25 platform.h | 2 +-
26 session.c | 10 +++++-----
27 session.h | 2 +-
28 sshd.c | 2 +-
29 sshpty.c | 4 ++--
30 sshpty.h | 2 +-
31 15 files changed, 99 insertions(+), 32 deletions(-)
32
33diff --git a/auth.h b/auth.h
34index 977562f0a..90802a5eb 100644
35--- a/auth.h
36+++ b/auth.h
37@@ -65,6 +65,7 @@ struct Authctxt {
38 char *service;
39 struct passwd *pw; /* set if 'valid' */
40 char *style;
41+ char *role;
42
43 /* Method lists for multiple authentication */
44 char **auth_methods; /* modified from server config */
45diff --git a/auth2.c b/auth2.c
46index a77742819..3035926ba 100644
47--- a/auth2.c
48+++ b/auth2.c
49@@ -257,7 +257,7 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
50 {
51 Authctxt *authctxt = ssh->authctxt;
52 Authmethod *m = NULL;
53- char *user, *service, *method, *style = NULL;
54+ char *user, *service, *method, *style = NULL, *role = NULL;
55 int authenticated = 0;
56 double tstart = monotime_double();
57
58@@ -270,8 +270,13 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
59 debug("userauth-request for user %s service %s method %s", user, service, method);
60 debug("attempt %d failures %d", authctxt->attempt, authctxt->failures);
61
62+ if ((role = strchr(user, '/')) != NULL)
63+ *role++ = 0;
64+
65 if ((style = strchr(user, ':')) != NULL)
66 *style++ = 0;
67+ else if (role && (style = strchr(role, ':')) != NULL)
68+ *style++ = '\0';
69
70 if (authctxt->attempt++ == 0) {
71 /* setup auth context */
72@@ -298,8 +303,9 @@ input_userauth_request(int type, u_int32_t seq, struct ssh *ssh)
73 use_privsep ? " [net]" : "");
74 authctxt->service = xstrdup(service);
75 authctxt->style = style ? xstrdup(style) : NULL;
76+ authctxt->role = role ? xstrdup(role) : NULL;
77 if (use_privsep)
78- mm_inform_authserv(service, style);
79+ mm_inform_authserv(service, style, role);
80 userauth_banner();
81 if (auth2_setup_methods_lists(authctxt) != 0)
82 packet_disconnect("no authentication methods enabled");
83diff --git a/monitor.c b/monitor.c
84index eabc1e89b..08fddabd7 100644
85--- a/monitor.c
86+++ b/monitor.c
87@@ -117,6 +117,7 @@ int mm_answer_sign(int, struct sshbuf *);
88 int mm_answer_pwnamallow(int, struct sshbuf *);
89 int mm_answer_auth2_read_banner(int, struct sshbuf *);
90 int mm_answer_authserv(int, struct sshbuf *);
91+int mm_answer_authrole(int, struct sshbuf *);
92 int mm_answer_authpassword(int, struct sshbuf *);
93 int mm_answer_bsdauthquery(int, struct sshbuf *);
94 int mm_answer_bsdauthrespond(int, struct sshbuf *);
95@@ -193,6 +194,7 @@ struct mon_table mon_dispatch_proto20[] = {
96 {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
97 {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
98 {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
99+ {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole},
100 {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner},
101 {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
102 #ifdef USE_PAM
103@@ -817,6 +819,7 @@ mm_answer_pwnamallow(int sock, struct sshbuf *m)
104
105 /* Allow service/style information on the auth context */
106 monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
107+ monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1);
108 monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1);
109
110 #ifdef USE_PAM
111@@ -850,16 +853,42 @@ mm_answer_authserv(int sock, struct sshbuf *m)
112 monitor_permit_authentications(1);
113
114 if ((r = sshbuf_get_cstring(m, &authctxt->service, NULL)) != 0 ||
115- (r = sshbuf_get_cstring(m, &authctxt->style, NULL)) != 0)
116+ (r = sshbuf_get_cstring(m, &authctxt->style, NULL)) != 0 ||
117+ (r = sshbuf_get_cstring(m, &authctxt->role, NULL)) != 0)
118 fatal("%s: buffer error: %s", __func__, ssh_err(r));
119- debug3("%s: service=%s, style=%s",
120- __func__, authctxt->service, authctxt->style);
121+ debug3("%s: service=%s, style=%s, role=%s",
122+ __func__, authctxt->service, authctxt->style, authctxt->role);
123
124 if (strlen(authctxt->style) == 0) {
125 free(authctxt->style);
126 authctxt->style = NULL;
127 }
128
129+ if (strlen(authctxt->role) == 0) {
130+ free(authctxt->role);
131+ authctxt->role = NULL;
132+ }
133+
134+ return (0);
135+}
136+
137+int
138+mm_answer_authrole(int sock, struct sshbuf *m)
139+{
140+ int r;
141+
142+ monitor_permit_authentications(1);
143+
144+ if ((r = sshbuf_get_cstring(m, &authctxt->role, NULL)) != 0)
145+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
146+ debug3("%s: role=%s",
147+ __func__, authctxt->role);
148+
149+ if (strlen(authctxt->role) == 0) {
150+ free(authctxt->role);
151+ authctxt->role = NULL;
152+ }
153+
154 return (0);
155 }
156
157@@ -1501,7 +1530,7 @@ mm_answer_pty(int sock, struct sshbuf *m)
158 res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty));
159 if (res == 0)
160 goto error;
161- pty_setowner(authctxt->pw, s->tty);
162+ pty_setowner(authctxt->pw, s->tty, authctxt->role);
163
164 if ((r = sshbuf_put_u32(m, 1)) != 0 ||
165 (r = sshbuf_put_cstring(m, s->tty)) != 0)
166diff --git a/monitor.h b/monitor.h
167index 44fbed589..8f65e684d 100644
168--- a/monitor.h
169+++ b/monitor.h
170@@ -66,6 +66,8 @@ enum monitor_reqtype {
171 MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
172 MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
173
174+ MONITOR_REQ_AUTHROLE = 154,
175+
176 };
177
178 struct monitor {
179diff --git a/monitor_wrap.c b/monitor_wrap.c
180index 1865a122a..fd4d7eb3b 100644
181--- a/monitor_wrap.c
182+++ b/monitor_wrap.c
183@@ -369,10 +369,10 @@ mm_auth2_read_banner(void)
184 return (banner);
185 }
186
187-/* Inform the privileged process about service and style */
188+/* Inform the privileged process about service, style, and role */
189
190 void
191-mm_inform_authserv(char *service, char *style)
192+mm_inform_authserv(char *service, char *style, char *role)
193 {
194 struct sshbuf *m;
195 int r;
196@@ -382,7 +382,8 @@ mm_inform_authserv(char *service, char *style)
197 if ((m = sshbuf_new()) == NULL)
198 fatal("%s: sshbuf_new failed", __func__);
199 if ((r = sshbuf_put_cstring(m, service)) != 0 ||
200- (r = sshbuf_put_cstring(m, style ? style : "")) != 0)
201+ (r = sshbuf_put_cstring(m, style ? style : "")) != 0 ||
202+ (r = sshbuf_put_cstring(m, role ? role : "")) != 0)
203 fatal("%s: buffer error: %s", __func__, ssh_err(r));
204
205 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHSERV, m);
206@@ -390,6 +391,26 @@ mm_inform_authserv(char *service, char *style)
207 sshbuf_free(m);
208 }
209
210+/* Inform the privileged process about role */
211+
212+void
213+mm_inform_authrole(char *role)
214+{
215+ struct sshbuf *m;
216+ int r;
217+
218+ debug3("%s entering", __func__);
219+
220+ if ((m = sshbuf_new()) == NULL)
221+ fatal("%s: sshbuf_new failed", __func__);
222+ if ((r = sshbuf_put_cstring(m, role ? role : "")) != 0)
223+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
224+
225+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, m);
226+
227+ sshbuf_free(m);
228+}
229+
230 /* Do the password authentication */
231 int
232 mm_auth_password(struct ssh *ssh, char *password)
233diff --git a/monitor_wrap.h b/monitor_wrap.h
234index 7f93144ff..79e78cc90 100644
235--- a/monitor_wrap.h
236+++ b/monitor_wrap.h
237@@ -43,7 +43,8 @@ int mm_is_monitor(void);
238 DH *mm_choose_dh(int, int, int);
239 int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t,
240 const char *, u_int compat);
241-void mm_inform_authserv(char *, char *);
242+void mm_inform_authserv(char *, char *, char *);
243+void mm_inform_authrole(char *);
244 struct passwd *mm_getpwnamallow(const char *);
245 char *mm_auth2_read_banner(void);
246 int mm_auth_password(struct ssh *, char *);
247diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
248index 622988822..3e6e07670 100644
249--- a/openbsd-compat/port-linux.c
250+++ b/openbsd-compat/port-linux.c
251@@ -56,7 +56,7 @@ ssh_selinux_enabled(void)
252
253 /* Return the default security context for the given username */
254 static security_context_t
255-ssh_selinux_getctxbyname(char *pwname)
256+ssh_selinux_getctxbyname(char *pwname, const char *role)
257 {
258 security_context_t sc = NULL;
259 char *sename = NULL, *lvl = NULL;
260@@ -71,9 +71,16 @@ ssh_selinux_getctxbyname(char *pwname)
261 #endif
262
263 #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL
264- r = get_default_context_with_level(sename, lvl, NULL, &sc);
265+ if (role != NULL && role[0])
266+ r = get_default_context_with_rolelevel(sename, role, lvl, NULL,
267+ &sc);
268+ else
269+ r = get_default_context_with_level(sename, lvl, NULL, &sc);
270 #else
271- r = get_default_context(sename, NULL, &sc);
272+ if (role != NULL && role[0])
273+ r = get_default_context_with_role(sename, role, NULL, &sc);
274+ else
275+ r = get_default_context(sename, NULL, &sc);
276 #endif
277
278 if (r != 0) {
279@@ -103,7 +110,7 @@ ssh_selinux_getctxbyname(char *pwname)
280
281 /* Set the execution context to the default for the specified user */
282 void
283-ssh_selinux_setup_exec_context(char *pwname)
284+ssh_selinux_setup_exec_context(char *pwname, const char *role)
285 {
286 security_context_t user_ctx = NULL;
287
288@@ -112,7 +119,7 @@ ssh_selinux_setup_exec_context(char *pwname)
289
290 debug3("%s: setting execution context", __func__);
291
292- user_ctx = ssh_selinux_getctxbyname(pwname);
293+ user_ctx = ssh_selinux_getctxbyname(pwname, role);
294 if (setexeccon(user_ctx) != 0) {
295 switch (security_getenforce()) {
296 case -1:
297@@ -134,7 +141,7 @@ ssh_selinux_setup_exec_context(char *pwname)
298
299 /* Set the TTY context for the specified user */
300 void
301-ssh_selinux_setup_pty(char *pwname, const char *tty)
302+ssh_selinux_setup_pty(char *pwname, const char *tty, const char *role)
303 {
304 security_context_t new_tty_ctx = NULL;
305 security_context_t user_ctx = NULL;
306@@ -146,7 +153,7 @@ ssh_selinux_setup_pty(char *pwname, const char *tty)
307
308 debug3("%s: setting TTY context on %s", __func__, tty);
309
310- user_ctx = ssh_selinux_getctxbyname(pwname);
311+ user_ctx = ssh_selinux_getctxbyname(pwname, role);
312
313 /* XXX: should these calls fatal() upon failure in enforcing mode? */
314
315diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h
316index 3c22a854d..c88129428 100644
317--- a/openbsd-compat/port-linux.h
318+++ b/openbsd-compat/port-linux.h
319@@ -19,8 +19,8 @@
320
321 #ifdef WITH_SELINUX
322 int ssh_selinux_enabled(void);
323-void ssh_selinux_setup_pty(char *, const char *);
324-void ssh_selinux_setup_exec_context(char *);
325+void ssh_selinux_setup_pty(char *, const char *, const char *);
326+void ssh_selinux_setup_exec_context(char *, const char *);
327 void ssh_selinux_change_context(const char *);
328 void ssh_selinux_setfscreatecon(const char *);
329 #endif
330diff --git a/platform.c b/platform.c
331index 41acc9370..35654ea51 100644
332--- a/platform.c
333+++ b/platform.c
334@@ -142,7 +142,7 @@ platform_setusercontext(struct passwd *pw)
335 * called if sshd is running as root.
336 */
337 void
338-platform_setusercontext_post_groups(struct passwd *pw)
339+platform_setusercontext_post_groups(struct passwd *pw, const char *role)
340 {
341 #if !defined(HAVE_LOGIN_CAP) && defined(USE_PAM)
342 /*
343@@ -183,7 +183,7 @@ platform_setusercontext_post_groups(struct passwd *pw)
344 }
345 #endif /* HAVE_SETPCRED */
346 #ifdef WITH_SELINUX
347- ssh_selinux_setup_exec_context(pw->pw_name);
348+ ssh_selinux_setup_exec_context(pw->pw_name, role);
349 #endif
350 }
351
352diff --git a/platform.h b/platform.h
353index ea4f9c584..60d72ffe7 100644
354--- a/platform.h
355+++ b/platform.h
356@@ -25,7 +25,7 @@ void platform_post_fork_parent(pid_t child_pid);
357 void platform_post_fork_child(void);
358 int platform_privileged_uidswap(void);
359 void platform_setusercontext(struct passwd *);
360-void platform_setusercontext_post_groups(struct passwd *);
361+void platform_setusercontext_post_groups(struct passwd *, const char *);
362 char *platform_get_krb5_client(const char *);
363 char *platform_krb5_get_principal_name(const char *);
364 int platform_sys_dir_uid(uid_t);
365diff --git a/session.c b/session.c
366index 2d0958d11..19f38637e 100644
367--- a/session.c
368+++ b/session.c
369@@ -1380,7 +1380,7 @@ safely_chroot(const char *path, uid_t uid)
370
371 /* Set login name, uid, gid, and groups. */
372 void
373-do_setusercontext(struct passwd *pw)
374+do_setusercontext(struct passwd *pw, const char *role)
375 {
376 char uidstr[32], *chroot_path, *tmp;
377
378@@ -1408,7 +1408,7 @@ do_setusercontext(struct passwd *pw)
379 endgrent();
380 #endif
381
382- platform_setusercontext_post_groups(pw);
383+ platform_setusercontext_post_groups(pw, role);
384
385 if (!in_chroot && options.chroot_directory != NULL &&
386 strcasecmp(options.chroot_directory, "none") != 0) {
387@@ -1547,7 +1547,7 @@ do_child(struct ssh *ssh, Session *s, const char *command)
388
389 /* Force a password change */
390 if (s->authctxt->force_pwchange) {
391- do_setusercontext(pw);
392+ do_setusercontext(pw, s->authctxt->role);
393 child_close_fds(ssh);
394 do_pwchange(s);
395 exit(1);
396@@ -1565,7 +1565,7 @@ do_child(struct ssh *ssh, Session *s, const char *command)
397 /* When PAM is enabled we rely on it to do the nologin check */
398 if (!options.use_pam)
399 do_nologin(pw);
400- do_setusercontext(pw);
401+ do_setusercontext(pw, s->authctxt->role);
402 /*
403 * PAM session modules in do_setusercontext may have
404 * generated messages, so if this in an interactive
405@@ -1955,7 +1955,7 @@ session_pty_req(struct ssh *ssh, Session *s)
406 ssh_tty_parse_modes(ssh, s->ttyfd);
407
408 if (!use_privsep)
409- pty_setowner(s->pw, s->tty);
410+ pty_setowner(s->pw, s->tty, s->authctxt->role);
411
412 /* Set window size from the packet. */
413 pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel);
414diff --git a/session.h b/session.h
415index ce59dabd9..675c91146 100644
416--- a/session.h
417+++ b/session.h
418@@ -77,7 +77,7 @@ void session_pty_cleanup2(Session *);
419 Session *session_new(void);
420 Session *session_by_tty(char *);
421 void session_close(struct ssh *, Session *);
422-void do_setusercontext(struct passwd *);
423+void do_setusercontext(struct passwd *, const char *);
424
425 const char *session_get_remote_name_or_ip(struct ssh *, u_int, int);
426
427diff --git a/sshd.c b/sshd.c
428index 673db87f6..2bc6679e5 100644
429--- a/sshd.c
430+++ b/sshd.c
431@@ -683,7 +683,7 @@ privsep_postauth(Authctxt *authctxt)
432 reseed_prngs();
433
434 /* Drop privileges */
435- do_setusercontext(authctxt->pw);
436+ do_setusercontext(authctxt->pw, authctxt->role);
437
438 skip:
439 /* It is safe now to apply the key state */
440diff --git a/sshpty.c b/sshpty.c
441index 4da84d05f..676ade50e 100644
442--- a/sshpty.c
443+++ b/sshpty.c
444@@ -162,7 +162,7 @@ pty_change_window_size(int ptyfd, u_int row, u_int col,
445 }
446
447 void
448-pty_setowner(struct passwd *pw, const char *tty)
449+pty_setowner(struct passwd *pw, const char *tty, const char *role)
450 {
451 struct group *grp;
452 gid_t gid;
453@@ -184,7 +184,7 @@ pty_setowner(struct passwd *pw, const char *tty)
454 strerror(errno));
455
456 #ifdef WITH_SELINUX
457- ssh_selinux_setup_pty(pw->pw_name, tty);
458+ ssh_selinux_setup_pty(pw->pw_name, tty, role);
459 #endif
460
461 if (st.st_uid != pw->pw_uid || st.st_gid != gid) {
462diff --git a/sshpty.h b/sshpty.h
463index 9ec7e9a15..de7e000ae 100644
464--- a/sshpty.h
465+++ b/sshpty.h
466@@ -24,5 +24,5 @@ int pty_allocate(int *, int *, char *, size_t);
467 void pty_release(const char *);
468 void pty_make_controlling_tty(int *, const char *);
469 void pty_change_window_size(int, u_int, u_int, u_int, u_int);
470-void pty_setowner(struct passwd *, const char *);
471+void pty_setowner(struct passwd *, const char *, const char *);
472 void disconnect_controlling_tty(void);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..ff6011442
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,33 @@
1gssapi.patch
2restore-tcp-wrappers.patch
3selinux-role.patch
4ssh-vulnkey-compat.patch
5keepalive-extensions.patch
6syslog-level-silent.patch
7user-group-modes.patch
8scp-quoting.patch
9shell-path.patch
10dnssec-sshfp.patch
11mention-ssh-keygen-on-keychange.patch
12package-versioning.patch
13debian-banner.patch
14authorized-keys-man-symlink.patch
15openbsd-docs.patch
16ssh-argv0.patch
17doc-hash-tab-completion.patch
18ssh-agent-setgid.patch
19no-openssl-version-status.patch
20gnome-ssh-askpass2-icon.patch
21systemd-readiness.patch
22debian-config.patch
23restore-authorized_keys2.patch
24seccomp-s390-flock-ipc.patch
25seccomp-s390-ioctl-ep11-crypto.patch
26conch-old-privkey-format.patch
27scp-disallow-dot-or-empty-filename.patch
28sanitize-scp-filenames-via-snmprintf.patch
29have-progressmeter-force-update-at-beginning-and-end-transfer.patch
30check-filenames-in-scp-client.patch
31fix-key-type-check.patch
32request-rsa-sha2-cert-signatures.patch
33scp-handle-braces.patch
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
new file mode 100644
index 000000000..ad574e829
--- /dev/null
+++ b/debian/patches/shell-path.patch
@@ -0,0 +1,39 @@
1From cabad6b7182cd6eaa8b760718200a316e7f578ed 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 6d819279e..700ea6c3c 100644
20--- a/sshconnect.c
21+++ b/sshconnect.c
22@@ -229,7 +229,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, u_short port,
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@@ -1534,7 +1534,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/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch
new file mode 100644
index 000000000..ed6ef3d46
--- /dev/null
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -0,0 +1,40 @@
1From 6d4521d39a852dc5627187c045c933f4e1cb4601 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 83b2b41c8..7230704a3 100644
17--- a/ssh-agent.1
18+++ b/ssh-agent.1
19@@ -206,6 +206,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.<ppid>
diff --git a/debian/patches/ssh-argv0.patch b/debian/patches/ssh-argv0.patch
new file mode 100644
index 000000000..bb1e10973
--- /dev/null
+++ b/debian/patches/ssh-argv0.patch
@@ -0,0 +1,31 @@
1From d1064c2689df8d0894a68ac9671d14ab125bc91b 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 5dfad6daa..ad1ed0f86 100644
22--- a/ssh.1
23+++ b/ssh.1
24@@ -1585,6 +1585,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..ca3e090bd
--- /dev/null
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -0,0 +1,42 @@
1From eccbd3637a2b8544fdcfdd5d1a00a9dfdac62aeb 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 36bc5e59a..5e655e924 100644
21--- a/readconf.c
22+++ b/readconf.c
23@@ -190,6 +190,7 @@ static struct {
24 { "fallbacktorsh", oDeprecated },
25 { "globalknownhostsfile2", oDeprecated },
26 { "rhostsauthentication", oDeprecated },
27+ { "useblacklistedkeys", oDeprecated },
28 { "userknownhostsfile2", oDeprecated },
29 { "useroaming", oDeprecated },
30 { "usersh", oDeprecated },
31diff --git a/servconf.c b/servconf.c
32index 4668b8a45..6caf1db38 100644
33--- a/servconf.c
34+++ b/servconf.c
35@@ -600,6 +600,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", sDeprecated, SSHCFG_GLOBAL },
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
new file mode 100644
index 000000000..3093a41fb
--- /dev/null
+++ b/debian/patches/syslog-level-silent.patch
@@ -0,0 +1,47 @@
1From e755ec70d62bfb9b02159123f4e870b00010be77 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 d9c2d136c..1749af6d1 100644
25--- a/log.c
26+++ b/log.c
27@@ -93,6 +93,7 @@ static struct {
28 LogLevel val;
29 } log_levels[] =
30 {
31+ { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */
32 { "QUIET", SYSLOG_LEVEL_QUIET },
33 { "FATAL", SYSLOG_LEVEL_FATAL },
34 { "ERROR", SYSLOG_LEVEL_ERROR },
35diff --git a/ssh.c b/ssh.c
36index 0777c31e4..3140fed4c 100644
37--- a/ssh.c
38+++ b/ssh.c
39@@ -1258,7 +1258,7 @@ main(int ac, char **av)
40 /* Do not allocate a tty if stdin is not a tty. */
41 if ((!isatty(fileno(stdin)) || stdin_null_flag) &&
42 options.request_tty != REQUEST_TTY_FORCE) {
43- if (tty_flag)
44+ if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
45 logit("Pseudo-terminal will not be allocated because "
46 "stdin is not a terminal.");
47 tty_flag = 0;
diff --git a/debian/patches/systemd-readiness.patch b/debian/patches/systemd-readiness.patch
new file mode 100644
index 000000000..c5dee41ad
--- /dev/null
+++ b/debian/patches/systemd-readiness.patch
@@ -0,0 +1,84 @@
1From da34947128351bee9d2530574432190548f5be58 Mon Sep 17 00:00:00 2001
2From: Michael Biebl <biebl@debian.org>
3Date: Mon, 21 Dec 2015 16:08:47 +0000
4Subject: Add systemd readiness notification support
5
6Bug-Debian: https://bugs.debian.org/778913
7Forwarded: no
8Last-Update: 2017-08-22
9
10Patch-Name: systemd-readiness.patch
11---
12 configure.ac | 24 ++++++++++++++++++++++++
13 sshd.c | 9 +++++++++
14 2 files changed, 33 insertions(+)
15
16diff --git a/configure.ac b/configure.ac
17index 917300b43..8a5db4cb5 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -4586,6 +4586,29 @@ AC_ARG_WITH([kerberos5],
21 AC_SUBST([GSSLIBS])
22 AC_SUBST([K5LIBS])
23
24+# Check whether user wants systemd support
25+SYSTEMD_MSG="no"
26+AC_ARG_WITH(systemd,
27+ [ --with-systemd Enable systemd support],
28+ [ if test "x$withval" != "xno" ; then
29+ AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no])
30+ if test "$PKGCONFIG" != "no"; then
31+ AC_MSG_CHECKING([for libsystemd])
32+ if $PKGCONFIG --exists libsystemd; then
33+ SYSTEMD_CFLAGS=`$PKGCONFIG --cflags libsystemd`
34+ SYSTEMD_LIBS=`$PKGCONFIG --libs libsystemd`
35+ CPPFLAGS="$CPPFLAGS $SYSTEMD_CFLAGS"
36+ SSHDLIBS="$SSHDLIBS $SYSTEMD_LIBS"
37+ AC_MSG_RESULT([yes])
38+ AC_DEFINE(HAVE_SYSTEMD, 1, [Define if you want systemd support.])
39+ SYSTEMD_MSG="yes"
40+ else
41+ AC_MSG_RESULT([no])
42+ fi
43+ fi
44+ fi ]
45+)
46+
47 # Looking for programs, paths and files
48
49 PRIVSEP_PATH=/var/empty
50@@ -5392,6 +5415,7 @@ echo " libldns support: $LDNS_MSG"
51 echo " Solaris process contract support: $SPC_MSG"
52 echo " Solaris project support: $SP_MSG"
53 echo " Solaris privilege support: $SPP_MSG"
54+echo " systemd support: $SYSTEMD_MSG"
55 echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG"
56 echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG"
57 echo " BSD Auth support: $BSD_AUTH_MSG"
58diff --git a/sshd.c b/sshd.c
59index d7e77d343..a1c3970b3 100644
60--- a/sshd.c
61+++ b/sshd.c
62@@ -85,6 +85,10 @@
63 #include <prot.h>
64 #endif
65
66+#ifdef HAVE_SYSTEMD
67+#include <systemd/sd-daemon.h>
68+#endif
69+
70 #include "xmalloc.h"
71 #include "ssh.h"
72 #include "ssh2.h"
73@@ -1990,6 +1994,11 @@ main(int ac, char **av)
74 }
75 }
76
77+#ifdef HAVE_SYSTEMD
78+ /* Signal systemd that we are ready to accept connections */
79+ sd_notify(0, "READY=1");
80+#endif
81+
82 /* Accept a connection and return in a forked child */
83 server_accept_loop(&sock_in, &sock_out,
84 &newsock, config_s);
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch
new file mode 100644
index 000000000..bc2390e06
--- /dev/null
+++ b/debian/patches/user-group-modes.patch
@@ -0,0 +1,210 @@
1From 7b931d36ad36a93d2b1811858ca29408ec44ecae 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: 2017-10-04
17
18Patch-Name: user-group-modes.patch
19---
20 auth-rhosts.c | 6 ++----
21 auth.c | 3 +--
22 misc.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++-----
23 misc.h | 2 ++
24 readconf.c | 3 +--
25 ssh.1 | 2 ++
26 ssh_config.5 | 2 ++
27 7 files changed, 63 insertions(+), 13 deletions(-)
28
29diff --git a/auth-rhosts.c b/auth-rhosts.c
30index 57296e1f6..546aa0495 100644
31--- a/auth-rhosts.c
32+++ b/auth-rhosts.c
33@@ -261,8 +261,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
34 return 0;
35 }
36 if (options.strict_modes &&
37- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
38- (st.st_mode & 022) != 0)) {
39+ !secure_permissions(&st, pw->pw_uid)) {
40 logit("Rhosts authentication refused for %.100s: "
41 "bad ownership or modes for home directory.", pw->pw_name);
42 auth_debug_add("Rhosts authentication refused for %.100s: "
43@@ -288,8 +287,7 @@ auth_rhosts2(struct passwd *pw, const char *client_user, const char *hostname,
44 * allowing access to their account by anyone.
45 */
46 if (options.strict_modes &&
47- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
48- (st.st_mode & 022) != 0)) {
49+ !secure_permissions(&st, pw->pw_uid)) {
50 logit("Rhosts authentication refused for %.100s: bad modes for %.200s",
51 pw->pw_name, buf);
52 auth_debug_add("Bad file modes for %.200s", buf);
53diff --git a/auth.c b/auth.c
54index d8e6b4a3d..9d1d453f1 100644
55--- a/auth.c
56+++ b/auth.c
57@@ -473,8 +473,7 @@ check_key_in_hostfiles(struct passwd *pw, struct sshkey *key, const char *host,
58 user_hostfile = tilde_expand_filename(userfile, pw->pw_uid);
59 if (options.strict_modes &&
60 (stat(user_hostfile, &st) == 0) &&
61- ((st.st_uid != 0 && st.st_uid != pw->pw_uid) ||
62- (st.st_mode & 022) != 0)) {
63+ !secure_permissions(&st, pw->pw_uid)) {
64 logit("Authentication refused for %.100s: "
65 "bad owner or modes for %.200s",
66 pw->pw_name, user_hostfile);
67diff --git a/misc.c b/misc.c
68index bdc06fdb3..5159e6692 100644
69--- a/misc.c
70+++ b/misc.c
71@@ -58,8 +58,9 @@
72 #include <netdb.h>
73 #ifdef HAVE_PATHS_H
74 # include <paths.h>
75-#include <pwd.h>
76 #endif
77+#include <pwd.h>
78+#include <grp.h>
79 #ifdef SSH_TUN_OPENBSD
80 #include <net/if.h>
81 #endif
82@@ -1028,6 +1029,55 @@ percent_expand(const char *string, ...)
83 #undef EXPAND_MAX_KEYS
84 }
85
86+int
87+secure_permissions(struct stat *st, uid_t uid)
88+{
89+ if (!platform_sys_dir_uid(st->st_uid) && st->st_uid != uid)
90+ return 0;
91+ if ((st->st_mode & 002) != 0)
92+ return 0;
93+ if ((st->st_mode & 020) != 0) {
94+ /* If the file is group-writable, the group in question must
95+ * have exactly one member, namely the file's owner.
96+ * (Zero-member groups are typically used by setgid
97+ * binaries, and are unlikely to be suitable.)
98+ */
99+ struct passwd *pw;
100+ struct group *gr;
101+ int members = 0;
102+
103+ gr = getgrgid(st->st_gid);
104+ if (!gr)
105+ return 0;
106+
107+ /* Check primary group memberships. */
108+ while ((pw = getpwent()) != NULL) {
109+ if (pw->pw_gid == gr->gr_gid) {
110+ ++members;
111+ if (pw->pw_uid != uid)
112+ return 0;
113+ }
114+ }
115+ endpwent();
116+
117+ pw = getpwuid(st->st_uid);
118+ if (!pw)
119+ return 0;
120+
121+ /* Check supplementary group memberships. */
122+ if (gr->gr_mem[0]) {
123+ ++members;
124+ if (strcmp(pw->pw_name, gr->gr_mem[0]) ||
125+ gr->gr_mem[1])
126+ return 0;
127+ }
128+
129+ if (!members)
130+ return 0;
131+ }
132+ return 1;
133+}
134+
135 int
136 tun_open(int tun, int mode, char **ifname)
137 {
138@@ -1786,8 +1836,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
139 snprintf(err, errlen, "%s is not a regular file", buf);
140 return -1;
141 }
142- if ((!platform_sys_dir_uid(stp->st_uid) && stp->st_uid != uid) ||
143- (stp->st_mode & 022) != 0) {
144+ if (!secure_permissions(stp, uid)) {
145 snprintf(err, errlen, "bad ownership or modes for file %s",
146 buf);
147 return -1;
148@@ -1802,8 +1851,7 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
149 strlcpy(buf, cp, sizeof(buf));
150
151 if (stat(buf, &st) < 0 ||
152- (!platform_sys_dir_uid(st.st_uid) && st.st_uid != uid) ||
153- (st.st_mode & 022) != 0) {
154+ !secure_permissions(&st, uid)) {
155 snprintf(err, errlen,
156 "bad ownership or modes for directory %s", buf);
157 return -1;
158diff --git a/misc.h b/misc.h
159index 31b207a8d..aaf966e65 100644
160--- a/misc.h
161+++ b/misc.h
162@@ -168,6 +168,8 @@ int safe_path_fd(int, const char *, struct passwd *,
163 char *read_passphrase(const char *, int);
164 int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2)));
165
166+int secure_permissions(struct stat *st, uid_t uid);
167+
168 #define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
169 #define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b))
170 #define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y))
171diff --git a/readconf.c b/readconf.c
172index 052d4b1ac..6b01f20d2 100644
173--- a/readconf.c
174+++ b/readconf.c
175@@ -1820,8 +1820,7 @@ read_config_file_depth(const char *filename, struct passwd *pw,
176
177 if (fstat(fileno(f), &sb) == -1)
178 fatal("fstat %s: %s", filename, strerror(errno));
179- if (((sb.st_uid != 0 && sb.st_uid != getuid()) ||
180- (sb.st_mode & 022) != 0))
181+ if (!secure_permissions(&sb, getuid()))
182 fatal("Bad owner or permissions on %s", filename);
183 }
184
185diff --git a/ssh.1 b/ssh.1
186index 7760c3075..81f29af43 100644
187--- a/ssh.1
188+++ b/ssh.1
189@@ -1485,6 +1485,8 @@ The file format and configuration options are described in
190 .Xr ssh_config 5 .
191 Because of the potential for abuse, this file must have strict permissions:
192 read/write for the user, and not writable by others.
193+It may be group-writable provided that the group in question contains only
194+the user.
195 .Pp
196 .It Pa ~/.ssh/environment
197 Contains additional definitions for environment variables; see
198diff --git a/ssh_config.5 b/ssh_config.5
199index 54e143c93..7d55fa820 100644
200--- a/ssh_config.5
201+++ b/ssh_config.5
202@@ -1835,6 +1835,8 @@ The format of this file is described above.
203 This file is used by the SSH client.
204 Because of the potential for abuse, this file must have strict permissions:
205 read/write for the user, and not accessible by others.
206+It may be group-writable provided that the group in question contains only
207+the user.
208 .It Pa /etc/ssh/ssh_config
209 Systemwide configuration file.
210 This file provides defaults for those
diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in
new file mode 100644
index 000000000..c619f3451
--- /dev/null
+++ b/debian/po/POTFILES.in
@@ -0,0 +1 @@
[type: gettext/rfc822deb] openssh-server.templates
diff --git a/debian/po/cs.po b/debian/po/cs.po
new file mode 100644
index 000000000..d01e0ffdc
--- /dev/null
+++ b/debian/po/cs.po
@@ -0,0 +1,55 @@
1# Czech PO debconf template translation of openssh.
2# Copyright (C) 2014 Michal Simunek <michal.simunek@gmail.com>
3# This file is distributed under the same license as the openssh package.
4# Michal Simunek <michal.simunek@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh 1:6.6p1-1\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-06-12 12:25+0200\n"
12"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
13"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
14"Language: cs\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=utf-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "Zakázat ověřování heslem pro uživatele root?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin prohibit-password\", which disables password "
32"authentication for root without breaking systems that have explicitly "
33"configured SSH public key authentication for root."
34msgstr ""
35"Předchozí verze openssh-server dovolovala přihlašovat se přes SSH jako root "
36"pomocí ověřování heslem. Výchozí volba pro nové instalace je nyní "
37"\"PermitRootLogin prohibit-password\", která zakazuje ověřování heslem pro "
38"uživatele root, aniž by to omezilo systémy, které mají explicitně nastaveno "
39"ověřování veřejným SSH klíčem pro uživatele root."
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"Tato změna činí systémy zabezpečenějšími proti útokům hrubou silou na heslo "
52"uživatele root pomocí slovníku (velmi častý cíl útoků). Nicméně, to může "
53"poškodit systémy, které jsou nastaveny s předpokladem, že bude možné se "
54"přihlašovat přes SSH jako root pomocí ověřování heslem. Změnu této volby "
55"byste měli provést pouze pokud ověřování heslem potřebujete."
diff --git a/debian/po/da.po b/debian/po/da.po
new file mode 100644
index 000000000..70d576d7b
--- /dev/null
+++ b/debian/po/da.po
@@ -0,0 +1,55 @@
1# Danish translation openssh.
2# Copyright (C) 2014 openssh og nedenstående oversættere.
3# This file is distributed under the same license as the openssh package.
4# Joe Hansen <joedalton2@yahoo.dk>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-21 23:51+0200\n"
12"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
13"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
14"Language: da\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "Deaktiver SSH-adgangskodegodkendelse for root?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin prohibit-password\", which disables password "
32"authentication for root without breaking systems that have explicitly "
33"configured SSH public key authentication for root."
34msgstr ""
35"Tidligere versioner af openssh-server tillod indlogning som root over SSH "
36"med brug af adgangskodegodkendelse. Standarden for nye installationer er nu "
37"»PermitRootLogin prohibit-password«, som deaktiverer adgangskodegodkendelse "
38"for root uden at ødelægge systemer, som eksplicit har konfigureret SSH-"
39"offentlig nøglegodkendelse for root."
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"Denne ændring gør systemer mere sikre mod brute-force angreb vis ordlister "
52"med adgangskoder på root-brugeren (et meget ofte mål for sådanne angreb). "
53"Det kan dog ødelægge systemer, som er opsat med forventning om at kunne SSH "
54"som root via brug af adgangskodegodkendelse. Du skal kun lave denne ændring, "
55"hvis du ikke har brug for dette."
diff --git a/debian/po/de.po b/debian/po/de.po
new file mode 100644
index 000000000..ecba54b6c
--- /dev/null
+++ b/debian/po/de.po
@@ -0,0 +1,61 @@
1# openssh.
2# Copyright (C) 2014 Colin Watson
3# Copyright (C) 2014 Stephan Beck
4# This file is distributed under the same license as the openssh package.
5# Stephan Beck <sbeck@mailbox.org>, 2014.
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh_1:6.6p1-1\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-03-24 22:21+0100\n"
13"Last-Translator: Stephan Beck <sbeck@mailbox.org>\n"
14"Language-Team: Debian German translation team <debian-l10n-german@lists."
15"debian.org>\n"
16"Language: de\n"
17"MIME-Version: 1.0\n"
18"Content-Type: text/plain; charset=UTF-8\n"
19"Content-Transfer-Encoding: 8bit\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "SSH Passwort-Authentifizierung für »root« deaktivieren?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"Vorherige Versionen von openssh-server erlaubten das Anmelden als »root« "
38"über SSH unter Verwendung von Passwort-Authentifizierung. Die "
39"Standardeinstellung für Neuinstallationen lautet nun »PermitRootLogin "
40"prohibit-password«, wodurch die Passwort-Authentifizierung für »root« "
41"deaktiviert wird, und Systeme dennoch funktionsfähig bleiben, bei denen "
42"ausdrücklich die Authentifizierung als »root« mittels öffentlichem SSH-"
43"Schlüssel konfiguriert ist."
44
45#. Type: boolean
46#. Description
47#: ../openssh-server.templates:1001
48msgid ""
49"This change makes systems more secure against brute-force password "
50"dictionary attacks on the root user (a very common target for such attacks). "
51"However, it may break systems that are set up with the expectation of being "
52"able to SSH as root using password authentication. You should only make this "
53"change if you do not need to do that."
54msgstr ""
55"Diese Änderung sichert Systeme besser gegen jene Angriffe auf den Benutzer "
56"»root« (ein verbreitetes Ziel solcher Angriffe) ab, die das Passwort durch "
57"simples Ausprobieren aller Einträge von Wörterbüchern zu erraten versuchen. "
58"Sie kann allerdings dazu führen, dass Systeme nicht mehr funktionieren, die "
59"in der Absicht konfiguriert wurden, die Anmeldung als »root« über SSH unter "
60"Verwendung von Passwort-Authentifizierung zuzulassen. Sie sollten diese "
61"Änderung nur vornehmen, wenn Sie auf Letzteres verzichten können."
diff --git a/debian/po/es.po b/debian/po/es.po
new file mode 100644
index 000000000..de8a67ace
--- /dev/null
+++ b/debian/po/es.po
@@ -0,0 +1,80 @@
1# openssh po-debconf translation to Spanish
2# Copyright (C) 2014 Software in the Public Interest
3# This file is distributed under the same license as the openssh package.
4#
5# Changes:
6# - Initial translation
7# Matías A. Bellone <matiasbellone+debian@gmail.com>, 2014
8#
9# Traductores, si no conocen el formato PO, merece la pena leer la
10# de gettext, especialmente las secciones dedicadas a este
11# formato, por ejemplo ejecutando:
12# info -n '(gettext)PO Files'
13# info -n '(gettext)Header Entry'
14#
15# Equipo de traducción al español, por favor, lean antes de traducir
16# los siguientes documentos:
17#
18# - El proyecto de traducción de Debian al español
19# http://www.debian.org/intl/spanish/
20# especialmente las notas de traducción en
21# http://www.debian.org/intl/spanish/notas
22#
23# - La guía de traducción de po's de debconf:
24# /usr/share/doc/po-debconf/README-trans
25# o http://www.debian.org/intl/l10n/po-debconf/README-trans
26#
27msgid ""
28msgstr ""
29"Project-Id-Version: openssh\n"
30"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
31"POT-Creation-Date: 2014-03-20 02:06+0000\n"
32"PO-Revision-Date: 2014-03-23 20:43-0300\n"
33"Last-Translator: Matías Bellone <matiasbellone+debian@gmail.com>\n"
34"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
35"Language: es\n"
36"MIME-Version: 1.0\n"
37"Content-Type: text/plain; charset=UTF-8\n"
38"Content-Transfer-Encoding: 8bit\n"
39
40#. Type: boolean
41#. Description
42#: ../openssh-server.templates:1001
43msgid "Disable SSH password authentication for root?"
44msgstr ""
45"¿Desea desactivar la autenticación SSH mediante contraseña para el usuario "
46"root?"
47
48#. Type: boolean
49#. Description
50#: ../openssh-server.templates:1001
51msgid ""
52"Previous versions of openssh-server permitted logging in as root over SSH "
53"using password authentication. The default for new installations is now "
54"\"PermitRootLogin prohibit-password\", which disables password "
55"authentication for root without breaking systems that have explicitly "
56"configured SSH public key authentication for root."
57msgstr ""
58"Las versiones anteriores de openssh-server permitían iniciar sesión como "
59"usuario root utilizando autenticación con contraseña. La configuración "
60"predeterminada para las nuevas instalaciones ahora incluye «PermitRootLogin "
61"prohibit-password», lo que desactiva la autenticación con contraseña para el "
62"usuario root sin romper los sistemas que tienen configurado explícitamente "
63"la autenticación SSH utilizando claves públicas para el usuario root."
64
65#. Type: boolean
66#. Description
67#: ../openssh-server.templates:1001
68msgid ""
69"This change makes systems more secure against brute-force password "
70"dictionary attacks on the root user (a very common target for such attacks). "
71"However, it may break systems that are set up with the expectation of being "
72"able to SSH as root using password authentication. You should only make this "
73"change if you do not need to do that."
74msgstr ""
75"Este cambio hace que los sistemas sean más resistentes contra ataques de "
76"fuerza bruta basados en diccionarios sobre el usuario root (un objetivo muy "
77"común para este tipo de ataques). Sin embargo, podría romper sistemas cuya "
78"configuración permite que el usuario root inicie sesión a través de SSH "
79"utilizando una contraseña. Sólo debería realizar este cambio si no necesita "
80"este comportamiento."
diff --git a/debian/po/fr.po b/debian/po/fr.po
new file mode 100644
index 000000000..f7125e9a3
--- /dev/null
+++ b/debian/po/fr.po
@@ -0,0 +1,59 @@
1# Translation of openssh debconf template to French
2# Copyright (C) 2014
3# This file is distributed under the same license as the openssh package.
4# Étienne Gilli <etienne.gilli@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh_1:6.5p1-6\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-22 08:26+0100\n"
12"Last-Translator: Étienne Gilli <etienne.gilli@gmail.com>\n"
13"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
14"Language: fr\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr ""
24"Désactiver l’authentification SSH par mot de passe pour le superutilisateur ?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin prohibit-password\", which disables password "
33"authentication for root without breaking systems that have explicitly "
34"configured SSH public key authentication for root."
35msgstr ""
36"Les versions précédentes du paquet openssh-server autorisaient la connexion "
37"par SSH du superutilisateur (root) en utilisant l’authentification par mot "
38"de passe. Par défaut, les nouvelles installations ont maintenant l’option "
39"« PermitRootLogin prohibit-password », qui désactive l’authentification par "
40"mot de passe pour le compte « root », sans casser les systèmes qui ont "
41"configuré explicitement l’authentification SSH par clé publique pour ce "
42"compte."
43
44#. Type: boolean
45#. Description
46#: ../openssh-server.templates:1001
47msgid ""
48"This change makes systems more secure against brute-force password "
49"dictionary attacks on the root user (a very common target for such attacks). "
50"However, it may break systems that are set up with the expectation of being "
51"able to SSH as root using password authentication. You should only make this "
52"change if you do not need to do that."
53msgstr ""
54"Cette modification rend les systèmes plus robustes face aux attaques par "
55"force brute et par dictionnaire contre le superutilisateur (très souvent "
56"pris pour cible par ce type d’attaque). Cependant, cela peut rendre "
57"inutilisables les systèmes reposant sur la possibilité de se connecter au "
58"compte « root » par SSH avec authentification par mot de passe. Vous ne "
59"devriez appliquer cette modification que si ce n’est pas votre cas."
diff --git a/debian/po/it.po b/debian/po/it.po
new file mode 100644
index 000000000..dd7106090
--- /dev/null
+++ b/debian/po/it.po
@@ -0,0 +1,58 @@
1# Italian translation of openssh debconf messages.
2# Copyright (C) 2014, openssh package copyright holder
3# This file is distributed under the same license as the openssh package.
4# Beatrice Torracca <beatricet@libero.it>, 2014.
5msgid ""
6msgstr ""
7"Project-Id-Version: openssh\n"
8"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
9"POT-Creation-Date: 2014-03-20 02:06+0000\n"
10"PO-Revision-Date: 2014-03-28 11:12+0200\n"
11"Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
12"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
13"Language: it\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18"X-Generator: Virtaal 0.7.1\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr "Disabilitare l'autenticazione SSH con password per root?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin prohibit-password\", which disables password "
33"authentication for root without breaking systems that have explicitly "
34"configured SSH public key authentication for root."
35msgstr ""
36"Le versioni precedenti di openssh-server permettevano il login come root via "
37"SSH, usando l'autenticazione con password. Il comportamento predefinito "
38"delle nuove installazioni è «PermitRootLogin prohibit-password» che "
39"disabilita l'autenticazione con password per root, senza rendere non "
40"funzionanti sistemi che hanno esplicitamente configurato l'autenticazione "
41"SSH con chiave pubblica per root."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Questo cambiamento rende i sistemi più al sicuro da attacchi di forza bruta "
54"a dizionario sulle password per l'utente root (un obiettivo molto comune per "
55"tali attacchi). Tuttavia, può rendere non funzionanti sistemi che sono "
56"impostati facendo affidamento sulla possibilità di autenticazione SSH come "
57"root usando la password. Si dovrebbe fare questo cambiamento solo se non si "
58"ha bisogno di tale comportamento."
diff --git a/debian/po/ja.po b/debian/po/ja.po
new file mode 100644
index 000000000..db382f19a
--- /dev/null
+++ b/debian/po/ja.po
@@ -0,0 +1,55 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# victory <victory.deb@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-20 11:06+0900\n"
12"Last-Translator: victory <victory.deb@gmail.com>\n"
13"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
14"Language: ja\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18
19#. Type: boolean
20#. Description
21#: ../openssh-server.templates:1001
22msgid "Disable SSH password authentication for root?"
23msgstr "root での SSH パスワード認証を無効にしますか?"
24
25#. Type: boolean
26#. Description
27#: ../openssh-server.templates:1001
28msgid ""
29"Previous versions of openssh-server permitted logging in as root over SSH "
30"using password authentication. The default for new installations is now "
31"\"PermitRootLogin prohibit-password\", which disables password "
32"authentication for root without breaking systems that have explicitly "
33"configured SSH public key authentication for root."
34msgstr ""
35"openssh-server の以前のバージョンではパスワード認証を利用した SSH 経由の "
36"root のログインを許可していました。新しくインストールした場合のデフォルト値が"
37"現在は「PermitRootLogin prohibit-password」になり、root のパスワード認証を無"
38"効化しますが SSH の公開鍵認証を root 用に明示的に設定しているシステムでは特に"
39"問題はありません。"
40
41#. Type: boolean
42#. Description
43#: ../openssh-server.templates:1001
44msgid ""
45"This change makes systems more secure against brute-force password "
46"dictionary attacks on the root user (a very common target for such attacks). "
47"However, it may break systems that are set up with the expectation of being "
48"able to SSH as root using password authentication. You should only make this "
49"change if you do not need to do that."
50msgstr ""
51"この変更によりシステムは root ユーザ (こういった攻撃ではとても一般的な攻撃対"
52"象です) へのブルートフォースによるパスワード辞書攻撃に対してはより安全になり"
53"ます。しかしパスワード認証により root で SSH 接続できることを前提として構成し"
54"たシステムでは問題が発生する可能性があります。そういった必要のない場合にのみ"
55"この変更を行うようにしてください。"
diff --git a/debian/po/nl.po b/debian/po/nl.po
new file mode 100644
index 000000000..3afd6171e
--- /dev/null
+++ b/debian/po/nl.po
@@ -0,0 +1,60 @@
1# Dutch translation of openssh debconf templates.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-10-03 23:54+0200\n"
12"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
13"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
14"Language: nl\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr ""
25"Wachtwoordauthenticatie over SSH voor de systeembeheerder uitschakelen?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"Eerdere versies van de openssh-server lieten de systeembeheerder toe om zich "
38"over SSH te authenticeren met een wachtwoord. Voor nieuwe installaties is de "
39"standaard nu \"PermitRootLogin prohibit-password\". Deze standaardinstelling "
40"maakt het voor de systeembeheerder onmogelijk om zich via een wachtwoord te "
41"authenticeren. Deze instelling heeft geen impact op systemen waarbij de SSH-"
42"configuratie expliciet vereist dat de systeembeheerder zich authenticeert "
43"via een publieke sleutel."
44
45#. Type: boolean
46#. Description
47#: ../openssh-server.templates:1001
48msgid ""
49"This change makes systems more secure against brute-force password "
50"dictionary attacks on the root user (a very common target for such attacks). "
51"However, it may break systems that are set up with the expectation of being "
52"able to SSH as root using password authentication. You should only make this "
53"change if you do not need to do that."
54msgstr ""
55"Deze wijziging maakt systemen veiliger tegenover aanvallen met brute kracht "
56"(met een wachtwoordenwoordenboek) op de systeembeheerder, een zeer courant "
57"doelwit voor zulke aanvallen. Maar het kan systemen onbruikbaar maken die "
58"ingesteld werden vanuit de verwachting dat de systeembeheerder SSH kan "
59"gebruiken met authenticatie via wachtwoord. Enkel wanneer u dit laatste niet "
60"nodig heeft, zou u deze wijziging kunnen doorvoeren."
diff --git a/debian/po/pt.po b/debian/po/pt.po
new file mode 100644
index 000000000..2dab84ccf
--- /dev/null
+++ b/debian/po/pt.po
@@ -0,0 +1,59 @@
1# Translation of openssh's debconf messages to European Portuguese
2# Copyright (C) 2014 YEAR THE openssh'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4#
5# Américo Monteiro <a_monteiro@gmx.com>, 2014.
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh 1:6.6p1-1\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-03-21 21:13+0000\n"
12"Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
13"Language-Team: Portuguese <traduz@debianpt.org>\n"
14"Language: pt\n"
15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
18"Plural-Forms: nplurals=2; plural=(n != 1);\n"
19"X-Generator: Lokalize 1.4\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Desactivar a autenticação SSH por palavra passe para o root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"As versões anteriores do servidor openssh permitiam iniciar sessão como root "
38"sobre SSH usando autenticação por palavra-passe. A predefinição para novas "
39"instalações é agora \"PermitRootLogin prohibit-password\", a qual desactiva "
40"a autenticação por palavra-passe para o root sem danificar os sistemas que "
41"têm configurados explicitamente autenticação SSH por chave pública para o "
42"root."
43
44#. Type: boolean
45#. Description
46#: ../openssh-server.templates:1001
47msgid ""
48"This change makes systems more secure against brute-force password "
49"dictionary attacks on the root user (a very common target for such attacks). "
50"However, it may break systems that are set up with the expectation of being "
51"able to SSH as root using password authentication. You should only make this "
52"change if you do not need to do that."
53msgstr ""
54"Esta alteração torna os sistemas mais seguros contra ataques em que se "
55"forçam dicionários de palavras-passe no utilizador root (um alvo muito comum "
56"para tais ataques). No entanto, pode danificar sistemas que estão "
57"configurados com a expectativa de serem capazes de SSH como root usando "
58"autenticação por palavra-passe. Apenas deverá fazer esta alteração se não "
59"precisa de tal método de autenticação."
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
new file mode 100644
index 000000000..99b1182f1
--- /dev/null
+++ b/debian/po/pt_BR.po
@@ -0,0 +1,57 @@
1# Debconf translations for openssh.
2# Copyright (C) 2014 THE openssh'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the openssh package.
4# José de Figueiredo <deb.gnulinux@gmail.com>, 2014.
5#
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-11-23 23:49-0200\n"
13"Last-Translator: José de Figueiredo <deb.gnulinux@gmail.com>\n"
14"Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
15"org>\n"
16"Language: pt_BR\n"
17"MIME-Version: 1.0\n"
18"Content-Type: text/plain; charset=UTF-8\n"
19"Content-Transfer-Encoding: 8bit\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Desabilitar autenticação por senha do SSH para root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"Versões anteriores do openssh-server permitiam login como root sobre SSH "
38"usando autenticação por senha. O padrão para as novas instalações agora é "
39"\"PermitRootLogin prohibit-password\", que desabilita a autenticação por "
40"senha para root sem quebrar sistemas que tenham configurado explicitamente o "
41"SSH para autenticação por chave pública para root."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Esta alteração torna sistemas mais seguros contra ataques de força bruta por "
54"dicionário de senhas no usuário root (um alvo muito comum destes ataques). "
55"Entretanto, ela pode quebrar sistemas que foram configurados com a "
56"expectativa de acesso SSH com root usando autenticação por senha. Você deve "
57"fazer esta mudança somente se você não precisa fazer isso."
diff --git a/debian/po/ru.po b/debian/po/ru.po
new file mode 100644
index 000000000..f2e1dafc4
--- /dev/null
+++ b/debian/po/ru.po
@@ -0,0 +1,57 @@
1# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
2# This file is distributed under the same license as the openssh package.
3#
4# Yuri Kozlov <yuray@komyakino.ru>, 2014.
5msgid ""
6msgstr ""
7"Project-Id-Version: openssh 1:6.6p1-1\n"
8"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
9"POT-Creation-Date: 2014-03-20 02:06+0000\n"
10"PO-Revision-Date: 2014-03-22 10:04+0400\n"
11"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
12"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
13"Language: ru\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
18"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19"X-Generator: Lokalize 1.4\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Выключить в SSH аутентификацию по паролю для root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"В предыдущих версиях openssh-server разрешён вход с правами пользователя "
38"root через SSH с помощью аутентификации по паролю. При новых установках по "
39"умолчанию теперь используется настройка «PermitRootLogin prohibit-password», "
40"которая отключает аутентификацию по паролю для root, что не вредит системам, "
41"у которых в SSH для root настроена аутентификация по открытому ключу."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Это изменение делает системы более стойкими к атакам методом перебора "
54"словарных паролей для пользователя root (самая распространённая цель таких "
55"атак). Однако, это вредит системам, в которых специально настроен вход для "
56"root по SSH с парольной аутентификацией. Если это не ваш случай, то ответьте "
57"утвердительно."
diff --git a/debian/po/sv.po b/debian/po/sv.po
new file mode 100644
index 000000000..278b0ccbf
--- /dev/null
+++ b/debian/po/sv.po
@@ -0,0 +1,58 @@
1# Swedish translations for openssh package
2# Svenska översättningar för paket openssh.
3# Copyright (C) 2014 THE openssh'S COPYRIGHT HOLDER
4# This file is distributed under the same license as the openssh package.
5# Andreas Rönnquist <gusnan@gusnan.se>, 2014.
6#
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: 2014-03-21 21:36+0100\n"
13"Last-Translator: Andreas Rönnquist <gusnan@gusnan.se>\n"
14"Language-Team: Swedish\n"
15"Language: sv\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=UTF-8\n"
18"Content-Transfer-Encoding: 8bit\n"
19"Plural-Forms: nplurals=2; plural=(n != 1);\n"
20
21#. Type: boolean
22#. Description
23#: ../openssh-server.templates:1001
24msgid "Disable SSH password authentication for root?"
25msgstr "Inaktivera SSH-lösenordsautentisering för root?"
26
27#. Type: boolean
28#. Description
29#: ../openssh-server.templates:1001
30msgid ""
31"Previous versions of openssh-server permitted logging in as root over SSH "
32"using password authentication. The default for new installations is now "
33"\"PermitRootLogin prohibit-password\", which disables password "
34"authentication for root without breaking systems that have explicitly "
35"configured SSH public key authentication for root."
36msgstr ""
37"Tidigare versioner av openssh-server tillät inloggning som root över SSH med "
38"hjälp av lösenordsautentisering. Standardinställningen för nya "
39"installationer är nu \"PermitRootLogin prohibit-password\", vilket "
40"inaktiverar lösenordsautentisering för root utan att förstöra system som "
41"explicit har konfigurerat nyckelautentisering med hjälp av publika nycklar "
42"för root."
43
44#. Type: boolean
45#. Description
46#: ../openssh-server.templates:1001
47msgid ""
48"This change makes systems more secure against brute-force password "
49"dictionary attacks on the root user (a very common target for such attacks). "
50"However, it may break systems that are set up with the expectation of being "
51"able to SSH as root using password authentication. You should only make this "
52"change if you do not need to do that."
53msgstr ""
54"Denna förändring gör system säkrare mot brute-force-angrepp med hjälp av "
55"ordlistor med lösenord på root-användaren (ett väldigt vanligt mål för "
56"sådana angrepp). Dock så kan detta förstöra system som förväntas kunna "
57"använda SSH som root med hjälp av lösenordsautentisering. Du skall endast "
58"göra denna förändring om du inte har ett behov av att kunna göra detta."
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
new file mode 100644
index 000000000..47c9e3686
--- /dev/null
+++ b/debian/po/templates.pot
@@ -0,0 +1,46 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: openssh\n"
10"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
11"POT-Creation-Date: 2014-03-20 02:06+0000\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr ""
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin prohibit-password\", which disables password "
33"authentication for root without breaking systems that have explicitly "
34"configured SSH public key authentication for root."
35msgstr ""
36
37#. Type: boolean
38#. Description
39#: ../openssh-server.templates:1001
40msgid ""
41"This change makes systems more secure against brute-force password "
42"dictionary attacks on the root user (a very common target for such attacks). "
43"However, it may break systems that are set up with the expectation of being "
44"able to SSH as root using password authentication. You should only make this "
45"change if you do not need to do that."
46msgstr ""
diff --git a/debian/po/tr.po b/debian/po/tr.po
new file mode 100644
index 000000000..1ada04101
--- /dev/null
+++ b/debian/po/tr.po
@@ -0,0 +1,58 @@
1# Turkish translation of openssh package
2# Copyright (C) 2014 Mert Dirik
3# This file is distributed under the same license as the openssh package.
4# Mert Dirik <mertdirik@gmail.com>, 2014.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: openssh-server\n"
9"Report-Msgid-Bugs-To: openssh@packages.debian.org\n"
10"POT-Creation-Date: 2014-03-20 02:06+0000\n"
11"PO-Revision-Date: 2014-08-01 14:44+0200\n"
12"Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
13"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Generator: Poedit 1.5.4\n"
18"Language: tr\n"
19
20#. Type: boolean
21#. Description
22#: ../openssh-server.templates:1001
23msgid "Disable SSH password authentication for root?"
24msgstr "root kullanıcısının parola ile kimlik doğrulaması engellensin mi?"
25
26#. Type: boolean
27#. Description
28#: ../openssh-server.templates:1001
29msgid ""
30"Previous versions of openssh-server permitted logging in as root over SSH "
31"using password authentication. The default for new installations is now "
32"\"PermitRootLogin prohibit-password\", which disables password "
33"authentication for root without breaking systems that have explicitly "
34"configured SSH public key authentication for root."
35msgstr ""
36"openssh-server'ın önceki sürümleri parola ile kimlik doğrulama kullanılarak "
37"root kullanıcısının SSH üzerinden oturum açmasına izin veriyordu. Artık yeni "
38"kurulumların öntanımlı ayarı \"PermitRootLogin prohibit-password\" "
39"şeklindedir. Bu ayar root kullanıcısının parola kullanarak oturum açmasını "
40"yasaklar. SSH genel anahtar doğrulama yöntemine ayrıca izin veren mevcut "
41"sistemler bu ayardan etkilenmez."
42
43#. Type: boolean
44#. Description
45#: ../openssh-server.templates:1001
46msgid ""
47"This change makes systems more secure against brute-force password "
48"dictionary attacks on the root user (a very common target for such attacks). "
49"However, it may break systems that are set up with the expectation of being "
50"able to SSH as root using password authentication. You should only make this "
51"change if you do not need to do that."
52msgstr ""
53"Bu ayar sistemleri kaba kuvvet sözlükten parola saldırılarına karşı güvenli "
54"hale getirir (root kullanıcısı bu tarz saldırıların en büyük "
55"hedeflerindendir). Fakat bu ayarın etkinleştirilmesi, root kullanıcısına "
56"parola doğrulama yöntemiyle oturum açılabileceği varsayımıyla hareket eden "
57"sistemlerde eskiden çalışan düzenin bozulmasına sebep olacaktır. Bu "
58"değişikliği yalnızca sorun çıkarmayacağından eminseniz yapın."
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000000000..550306d4f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,230 @@
1#!/usr/bin/make -f
2
3export DEB_BUILD_MAINT_OPTIONS := hardening=+all
4
5include /usr/share/dpkg/default.mk
6
7# Uncomment this to turn on verbose mode.
8# export DH_VERBOSE=1
9
10# This has to be exported to make some magic below work.
11export DH_OPTIONS
12
13ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
14 RUN_TESTS := yes
15else
16 RUN_TESTS :=
17endif
18
19ifeq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
20 PARALLEL :=
21else
22 PARALLEL := \
23 -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
24endif
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
35# Change the version string to reflect distribution
36SSH_EXTRAVERSION := $(DEB_VENDOR)-$(shell echo '$(DEB_VERSION)' | sed -e 's/.*-//')
37
38UBUNTU := $(shell $(call dpkg_vendor_derives_from,Ubuntu))
39ifeq ($(UBUNTU),yes)
40DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games
41else
42DEFAULT_PATH := /usr/local/bin:/usr/bin:/bin:/usr/games
43endif
44SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
45
46ifeq ($(UBUNTU),yes)
47server_recommends := ssh-import-id
48else
49server_recommends :=
50endif
51
52# Common path configuration.
53confflags += --sysconfdir=/etc/ssh
54confflags += --libexecdir=\$${prefix}/lib/openssh
55
56# Common build options.
57confflags += --disable-strip
58confflags += --with-mantype=doc
59confflags += --with-4in6
60confflags += --with-privsep-path=/run/sshd
61confflags += --with-pid-dir=/run
62
63# The Hurd needs libcrypt for res_query et al.
64ifeq ($(DEB_HOST_ARCH_OS),hurd)
65confflags += --with-libs=-lcrypt
66endif
67
68# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
69ifeq ($(DEB_HOST_ARCH),hppa)
70confflags += --without-hardening
71endif
72
73# Everything above here is common to the deb and udeb builds.
74confflags_udeb := $(confflags)
75
76# Options specific to the deb build.
77confflags += --with-tcp-wrappers
78confflags += --with-pam
79confflags += --with-libedit
80confflags += --with-kerberos5=/usr
81confflags += --with-ssl-engine
82ifeq ($(DEB_HOST_ARCH_OS),linux)
83confflags += --with-selinux
84confflags += --with-audit=linux
85confflags += --with-systemd
86endif
87
88# The deb build wants xauth; the udeb build doesn't.
89confflags += --with-xauth=/usr/bin/xauth
90confflags_udeb += --without-xauth
91
92# Default paths. The udeb build has /usr/games removed.
93confflags += --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH)
94confflags_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
95
96# Compiler flags.
97cflags := $(CPPFLAGS) $(CFLAGS)
98cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
99cflags_udeb := -Os
100cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
101confflags += --with-cflags='$(cflags)'
102confflags_udeb += --with-cflags='$(cflags_udeb)'
103
104# Linker flags.
105confflags += --with-ldflags='$(strip -Wl,--as-needed $(LDFLAGS))'
106confflags_udeb += --with-ldflags='-Wl,--as-needed'
107
108%:
109 dh $@ --with=autoreconf,systemd
110
111autoreconf:
112 autoreconf -f -i
113 cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
114
115override_dh_autoreconf-arch:
116 dh_autoreconf debian/rules -- autoreconf
117
118override_dh_autoreconf-indep:
119
120override_dh_auto_configure-arch:
121 dh_auto_configure -Bdebian/build-deb -- $(confflags)
122ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
123 dh_auto_configure -Bdebian/build-udeb -- $(confflags_udeb)
124 # Avoid libnsl linkage. Ugh.
125 perl -pi -e 's/ +-lnsl//' debian/build-udeb/config.status
126 cd debian/build-udeb && ./config.status
127endif
128
129override_dh_auto_configure-indep:
130
131override_dh_auto_build-arch:
132 $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
133 $(MAKE) -C debian/build-deb regress-prep
134 $(MAKE) -C debian/build-deb $(PARALLEL) regress-binaries
135ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
136 $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
137endif
138
139ifeq ($(filter pkg.openssh.nognome,$(DEB_BUILD_PROFILES)),)
140 $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
141endif
142
143override_dh_auto_build-indep:
144
145override_dh_auto_test-arch:
146ifeq ($(RUN_TESTS),yes)
147 $(MAKE) -C debian/build-deb/regress \
148 .OBJDIR="$(CURDIR)/debian/build-deb/regress" \
149 .CURDIR="$(CURDIR)/regress" \
150 unit
151 $(MAKE) -C debian/build-deb compat-tests
152 $(MAKE) -C debian/keygen-test
153endif
154
155override_dh_auto_test-indep:
156
157override_dh_auto_clean:
158 rm -rf debian/build-deb debian/build-udeb
159ifeq ($(RUN_TESTS),yes)
160 $(MAKE) -C debian/keygen-test clean
161endif
162 $(MAKE) -C contrib clean
163
164override_dh_auto_install-arch:
165 $(MAKE) -C debian/build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
166
167override_dh_auto_install-indep:
168
169override_dh_install-arch:
170 rm -f debian/tmp/etc/ssh/sshd_config
171
172 dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
173ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
174 dh_install -popenssh-client-udeb -popenssh-server-udeb \
175 --sourcedir=debian/build-udeb
176endif
177
178 # Remove version control tags to avoid unnecessary conffile
179 # resolution steps for administrators.
180 sed -i '/\$$OpenBSD:/d' \
181 debian/openssh-server/etc/ssh/moduli \
182 debian/openssh-client/etc/ssh/ssh_config
183
184# We'd like to use dh_install --fail-missing here, but that doesn't work
185# well in combination with dh-exec: it complains that files generated by
186# dh-exec for architecture-dependent packages aren't installed.
187override_dh_install-indep:
188 rm -f debian/tmp/etc/ssh/sshd_config
189 dh_install
190
191override_dh_installdocs:
192 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
193 dh_installdocs -popenssh-server -popenssh-sftp-server \
194 --link-doc=openssh-client
195 # Avoid breaking dh_installexamples later.
196 mkdir -p debian/openssh-server/usr/share/doc/openssh-client
197
198override_dh_systemd_enable:
199 dh_systemd_enable -popenssh-server --name ssh ssh.service
200 dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket
201
202override_dh_installinit:
203 dh_installinit -R --name ssh
204
205debian/openssh-server.sshd.pam: debian/openssh-server.sshd.pam.in
206ifeq ($(DEB_HOST_ARCH_OS),linux)
207 sed 's/^@IF_KEYINIT@//' $< > $@
208else
209 sed '/^@IF_KEYINIT@/d' $< > $@
210endif
211
212override_dh_installpam: debian/openssh-server.sshd.pam
213 dh_installpam --name sshd
214
215override_dh_fixperms-arch:
216 dh_fixperms
217 chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign
218
219# Tighten libssl dependencies to match the check in entropy.c.
220override_dh_shlibdeps:
221 dh_shlibdeps
222 debian/adjust-openssl-dependencies
223
224override_dh_gencontrol:
225 dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)'
226
227debian/faq.html:
228 wget -O - http://www.openssh.com/faq.html | \
229 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.com/\2,g' \
230 > debian/faq.html
diff --git a/debian/run-tests b/debian/run-tests
new file mode 100755
index 000000000..7c7a8b2a3
--- /dev/null
+++ b/debian/run-tests
@@ -0,0 +1,39 @@
1#! /bin/sh
2# Run installed OpenSSH regression tests.
3
4tmp="$1"
5if [ -z "$tmp" ]; then
6 tmp="$(mktemp -d)"
7 cleanup () {
8 rm -rf "$tmp"
9 }
10 trap cleanup EXIT
11fi
12
13# Copy the regression tests to a fresh directory; this is easier than trying
14# to pick apart which ones need write access.
15cp -a /usr/lib/openssh/regress "$tmp/regress"
16
17ret=0
18make -C "$tmp/regress" \
19 .OBJDIR="$tmp/regress" \
20 .CURDIR="$tmp/regress" \
21 BUILDDIR="$tmp/regress" \
22 OBJ="$tmp/regress" \
23 SUDO=sudo \
24 TEST_SHELL=sh \
25 TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
26 TEST_SSH_PLINK=plink \
27 TEST_SSH_PUTTYGEN=puttygen \
28 TEST_SSH_CONCH=conch \
29 TEST_SSH_IPV6=yes \
30 TEST_SSH_ECC=yes \
31 tests interop-tests </dev/zero || ret="$?"
32if [ "$ret" -ne 0 ]; then
33 for log in failed-regress.log failed-ssh.log failed-sshd.log; do
34 if [ -e "$tmp/regress/$log" ]; then
35 tail -v -n+0 "$tmp/regress/$log"
36 fi
37 done
38fi
39exit "$ret"
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/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 000000000..1a0c77d41
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
1# openssh-server/password-authentication is preseeding-only, at least for now.
2openssh source: untranslatable-debconf-templates openssh-server.templates: 20
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.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..8715aafaf
--- /dev/null
+++ b/debian/ssh-askpass-gnome.install
@@ -0,0 +1,3 @@
1#! /usr/bin/dh-exec
2contrib/gnome-ssh-askpass3 => 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.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/rescue-ssh.target b/debian/systemd/rescue-ssh.target
new file mode 100644
index 000000000..9501b7fd0
--- /dev/null
+++ b/debian/systemd/rescue-ssh.target
@@ -0,0 +1,6 @@
1[Unit]
2Description=Rescue with network and ssh
3Documentation=man:systemd.special(7)
4Requires=network-online.target ssh.service
5After=network-online.target ssh.service
6AllowIsolate=yes
diff --git a/debian/systemd/ssh-agent.override b/debian/systemd/ssh-agent.override
new file mode 100644
index 000000000..2905494b6
--- /dev/null
+++ b/debian/systemd/ssh-agent.override
@@ -0,0 +1 @@
manual
diff --git a/debian/systemd/ssh-agent.service b/debian/systemd/ssh-agent.service
new file mode 100644
index 000000000..cdc10bb47
--- /dev/null
+++ b/debian/systemd/ssh-agent.service
@@ -0,0 +1,11 @@
1[Unit]
2Description=OpenSSH Agent
3Documentation=man:ssh-agent(1)
4Before=graphical-session-pre.target
5ConditionPathExists=/etc/X11/Xsession.options
6Wants=dbus.socket
7After=dbus.socket
8
9[Service]
10ExecStart=/usr/lib/openssh/agent-launch start
11ExecStopPost=/usr/lib/openssh/agent-launch stop
diff --git a/debian/systemd/ssh-session-cleanup b/debian/systemd/ssh-session-cleanup
new file mode 100755
index 000000000..f283cc967
--- /dev/null
+++ b/debian/systemd/ssh-session-cleanup
@@ -0,0 +1,11 @@
1#! /bin/sh
2
3ssh_session_pattern='sshd: \S.*@pts/[0-9]+'
4
5IFS="$IFS@"
6pgrep -a -f "$ssh_session_pattern" | while read pid daemon user pty; do
7 echo "Found ${daemon%:} session $pid on $pty; sending SIGTERM"
8 kill "$pid" || true
9done
10
11exit 0
diff --git a/debian/systemd/ssh-session-cleanup.service b/debian/systemd/ssh-session-cleanup.service
new file mode 100644
index 000000000..b86727227
--- /dev/null
+++ b/debian/systemd/ssh-session-cleanup.service
@@ -0,0 +1,13 @@
1[Unit]
2Description=OpenBSD Secure Shell session cleanup
3Wants=network.target
4After=network.target
5
6[Service]
7ExecStart=/bin/true
8ExecStop=/usr/lib/openssh/ssh-session-cleanup
9RemainAfterExit=yes
10Type=oneshot
11
12[Install]
13WantedBy=multi-user.target
diff --git a/debian/systemd/ssh.service b/debian/systemd/ssh.service
new file mode 100644
index 000000000..7495d9a81
--- /dev/null
+++ b/debian/systemd/ssh.service
@@ -0,0 +1,22 @@
1[Unit]
2Description=OpenBSD Secure Shell server
3Documentation=man:sshd(8) man:sshd_config(5)
4After=network.target auditd.service
5ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
6
7[Service]
8EnvironmentFile=-/etc/default/ssh
9ExecStartPre=/usr/sbin/sshd -t
10ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
11ExecReload=/usr/sbin/sshd -t
12ExecReload=/bin/kill -HUP $MAINPID
13KillMode=process
14Restart=on-failure
15RestartPreventExitStatus=255
16Type=notify
17RuntimeDirectory=sshd
18RuntimeDirectoryMode=0755
19
20[Install]
21WantedBy=multi-user.target
22Alias=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..f7fec1f6f
--- /dev/null
+++ b/debian/systemd/ssh@.service
@@ -0,0 +1,11 @@
1[Unit]
2Description=OpenBSD Secure Shell server per-connection daemon
3Documentation=man:sshd(8) man:sshd_config(5)
4After=auditd.service
5
6[Service]
7EnvironmentFile=-/etc/default/ssh
8ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS
9StandardInput=socket
10RuntimeDirectory=sshd
11RuntimeDirectoryMode=0755
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 000000000..b010ac63c
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,10 @@
1Tests: regress
2Restrictions: needs-root allow-stderr
3Depends: devscripts,
4 haveged,
5 openssh-tests,
6 openssl,
7 putty-tools,
8 python-twisted-conch,
9 sudo,
10 sysvinit-utils,
diff --git a/debian/tests/regress b/debian/tests/regress
new file mode 100755
index 000000000..8bb73ee95
--- /dev/null
+++ b/debian/tests/regress
@@ -0,0 +1,66 @@
1#! /bin/sh
2set -e
3
4if [ "$(id -un)" != openssh-tests ]; then
5 TMP="$ADTTMP/user"
6 CREATED_RUN_SSHD=false
7 STARTED_HAVEGED=false
8
9 cleanup () {
10 if $STARTED_HAVEGED; then
11 if [ -d /run/systemd/system ] && \
12 which systemctl >/dev/null 2>&1; then
13 systemctl disable haveged || true
14 systemctl stop haveged || true
15 else
16 start-stop-daemon --stop --quiet \
17 --retry=TERM/30/KILL/5 \
18 --pidfile "$ADTTMP/haveged.pid" \
19 --name haveged
20 fi
21 fi
22 rm -f /etc/sudoers.d/openssh-tests
23 if id openssh-tests >/dev/null 2>&1; then
24 deluser --remove-home openssh-tests
25 fi
26
27 if $CREATED_RUN_SSHD; then
28 rm -rf /run/sshd
29 fi
30 }
31 trap cleanup EXIT
32
33 adduser --disabled-password --gecos 'OpenSSH tests' openssh-tests
34 cat >/etc/sudoers.d/openssh-tests <<EOF
35openssh-tests ALL = (ALL:ALL) NOPASSWD: ALL
36EOF
37 chmod 440 /etc/sudoers.d/openssh-tests
38 mkdir -p "$TMP"
39 chown -R openssh-tests:openssh-tests "$TMP"
40
41 # Depending on how the environment is configured, our test
42 # dependency on openssh-server may not actually started sshd and
43 # thus may not have caused /run/sshd to be created.
44 if [ ! -d /run/sshd ]; then
45 mkdir -m755 /run/sshd
46 CREATED_RUN_SSHD=:
47 fi
48
49 # If we're running in a container, haveged may not have started
50 # automatically.
51 if [ -d /run/systemd/system ] && which systemctl >/dev/null 2>&1; then
52 systemctl enable haveged || true
53 systemctl start haveged || true
54 STARTED_HAVEGED=:
55 elif ! pidof haveged >/dev/null; then
56 start-stop-daemon --start --quiet \
57 --pidfile "$ADTTMP/haveged.pid" \
58 --exec /usr/sbin/haveged -- -p "$ADTTMP/haveged.pid"
59 STARTED_HAVEGED=:
60 fi
61
62 sudo -u openssh-tests env TMP="$TMP" "$0" "$@"
63 exit "$?"
64fi
65
66annotate-output +%H:%M:%S.%N /usr/lib/openssh/regress/run-tests "$TMP"
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 000000000..974ad55f8
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,41 @@
1-----BEGIN PGP PUBLIC KEY BLOCK-----
2
3mQGdBFKmggUBDICUNqm4cNh7tdEbwaNhbnwqLiHpILeXT6sddGI0Stz5ofB1uvIH
4m9kXYG5XUUwlc5ywjIZm2JeuKqrd/6wAz5laLagFA6k86EZzzuBE3b5FxSQ4EN4K
55XZEJo61xASEF7z1mQCiqoA6/F407ht7nNoiVE95kOmqJlv4cqbpCw3n8f2VW+mV
6UH6MYRZVrYAC9NnJWv24rem2fjgFhNT1/bx44G7H9bVJqL7hMEGa+xYQBI3YT/ul
7Eu9HYmLFVeiZm1gB1eKXW7jS4ctLl5uPrxayA5DX/qNB2yqgVVlIKFwUm8gGPGPO
8nsNKo0xBseE7E0F/KeGpaT5aS9yFgPm9A652Jx9felYgb0e9Ipt3lxriPQwgF/cx
9LGuP/WEbN5fpWFnuV0ViklusuVI2e8GHJGU5bQD5AlzvWu4Sv6oBOcDCabScydY7
10IxPBk/XBWCF9QDIa2qa32Mc9dYc8EnJszPeVCHX5hG23omDRmdLGLwH7F+CuBvCx
11AKCymZtJl5DhRmnhdzRg9d+0VG4hLF7O06ANABEBAAG0H0RhbWllbiBNaWxsZXIg
12PGRqbUBtaW5kcm90Lm9yZz6JAc0EEwECACcCGwMFCQ1H67ECHgECF4AFAlKmjJwE
13CwkIBwYVCgkICwIFFgIDAQAACgkQ0+X1a22SDTB2TAx9E1ozPJKUGWJPZefqsSr8
14KsO6Dp3QuPrw2Zwgo2QfeCT+uzNA5AKCDIAaYEpVbQsvu4sDy8dAW1+HENCxVrMX
15WG+SH41lcdAdI4io0PGHVQDl42R5jX3e9pfjYCQALVv5BDXddK6054nyxEmudQ3I
16CFCYXIcqQbA1nfj3Uk06jGhuM99B2/akbxCoFSiUX9uHDZKNYAGpU7/FCF9xCZF4
17Kd9Twvyy17jDIg7km3/Q4Jy++VP8FyvE5JjBdLRQSBzSG9GCjv9fyKWW7S0bMY4D
183SKKt/Jm1XchEMgpRr4eBpgCs3rxO1hXjzqm3te97uy6/q8CuJUtupJsPKc9Wh4+
19ogUZifC0ta7UrxZp8yZTRvPSUxYrlvDzM32VDLQ3FX6Y2i4VNo48PSJMA+BPUx7D
20TcZKIXt457zsLD4jF4sRdwOk/QF/GXCkH2GAyKHWCPXIOe+jIXgiuajcqZm9cAWj
21L3hidSohKfefvKkzsg75mDmjhvAtDncIbmImJNjXIe2PQU4iY9Vq5i0vlaVKgBgK
22SrkBnQRSpoIFAQyA1OdwfpwXKch+O00W1FsQSMcEjahGmo84WTroM/qjTd7Ysld3
2300PMv3wkQn2WdhyTca/EmkW0fVTGSYs7Z3v5SpPf0prYSjmfu8WlXoz64ApdXqGH
24jj9KAeq2OuUtWrwobgiQEzU4Hxlz94X/65BgG5k7OTyE3J6bgRcMwJCgCkwjK85w
25bbBkGH+Jo9o/Zw9TPczQcE7BmGYkkLNAXbw7omKBOL4Z6w9sXToz9UnQ0EB9s4Tv
26AbHGKX9y2PEQjZN+wkzR3DavWB7ql8vHZIRmspAsDAJvDT1ofsNtu8MB8wJcxvZa
27oZ7j9wULYpnaNYx9xxEhgbB9o1mBcYsdDj3xz5jrgtq/cpdgGC6bg+awDc/ylQ1m
28NglKfY8P9hFIhIANZilnmAlk5GSoWclP/69m+u34KKoHU4Yc3I1pPNcL6Nyi0bh8
29mHqe9WedKfod7Y4yM1S20fXaS4vrLIlKgxbsDpWiWrk0ltV03uyC7eqDe3nzzGW/
302GLTHj5xsA2+HwGtPom5mmzjvV5PFNpS7a90JQARAQABiQG1BBgBAgAPBQJSpoIF
31AhsMBQkNR+uxAAoJENPl9Wttkg0wEScMf2QjDWm3XawJxNA8pqqxrFeTEo+GESzn
32VRTUeprrUFd1GHw33qaAvqLixZ+x8cr+1Gj/fJd5eiIVJfRLYbXlC8su8JZXngfX
330VhuMcUob/FTikfpcoYkRzriUsJEB3/OmjlLjGgnQm5Gz9TV1ityF3bzoHkR8svW
34EKKKzNoIEPHLU3y7bqSkOrjnY3bZfdVRh618XbjV28NMuoZsV8E4pOuQoy+3s5Ij
35mIf/mkSiFE3VJwdaPem23UsXatFb/eoC/Ahi0iCd/8ioFwi+oHT2Pnt9HrzVF6E8
36gBVO3vKo6UJgDTr9Qt27Nc6eHL0O5j50ins9ob/3DoOC3P5A08zhl+w466yGEv5+
37Es/usUAs/4ng4ksI3DTLK9Ygj70l5oBuMFYd3b5KGVfAIlGc5mwIOIG41YLIzZTr
38GuOuTymjwCdC9cUZJ6R2Cv/Vx0htZ0hqDdyaDO0Io9OG/W2s2T7160tY9ic4MwBC
39FemzwFELIBIIHNY/n/wsmxQGkI3Oj86JpOVVgR5lXWR+BrGcBjkSEyg=
40=1M/J
41-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 000000000..9e2a44eb3
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
1version=3
2opts=pgpsigurlmangle=s/$/.asc/ \
3https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-(.*)\.tar\.gz