summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/.git-dpm12
-rw-r--r--debian/.gitignore17
-rw-r--r--debian/.gitlab-ci.yml12
-rw-r--r--debian/NEWS274
-rw-r--r--debian/README.Debian295
-rwxr-xr-xdebian/adjust-openssl-dependencies36
-rwxr-xr-xdebian/agent-launch23
-rw-r--r--debian/changelog5708
-rw-r--r--debian/clean2
-rw-r--r--debian/control237
-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.apport35
-rw-r--r--debian/openssh-client.docs5
-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.apport27
-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.runit1
-rw-r--r--debian/openssh-server.ssh.default5
-rwxr-xr-xdebian/openssh-server.ssh.init162
-rw-r--r--debian/openssh-server.ssh.runscript/finish16
-rw-r--r--debian/openssh-server.ssh.runscript/run20
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/conch-old-privkey-format.patch68
-rw-r--r--debian/patches/debian-banner.patch163
-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/gnome-ssh-askpass2-icon.patch26
-rw-r--r--debian/patches/gssapi.patch4088
-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.patch47
-rw-r--r--debian/patches/regress-2020.patch44
-rw-r--r--debian/patches/restore-authorized_keys2.patch35
-rw-r--r--debian/patches/restore-tcp-wrappers.patch172
-rw-r--r--debian/patches/revert-ipqos-defaults.patch93
-rw-r--r--debian/patches/sandbox-seccomp-clock_gettime64.patch30
-rw-r--r--debian/patches/sandbox-seccomp-clock_nanosleep.patch31
-rw-r--r--debian/patches/sandbox-seccomp-clock_nanosleep_time64.patch29
-rw-r--r--debian/patches/scp-quoting.patch41
-rw-r--r--debian/patches/selinux-role.patch472
-rw-r--r--debian/patches/series29
-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/rules228
-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
123 files changed, 17157 insertions, 0 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
new file mode 100644
index 000000000..c1b3b255f
--- /dev/null
+++ b/debian/.git-dpm
@@ -0,0 +1,12 @@
1# see git-dpm(1) from git-dpm package
293e9440bae1818746e0cc7f2543001db9d0ea1ea
393e9440bae1818746e0cc7f2543001db9d0ea1ea
44213eec74e74de6310c27a40c3e9759a08a73996
54213eec74e74de6310c27a40c3e9759a08a73996
6openssh_8.1p1.orig.tar.gz
7c44b96094869f177735ae053d92bd5fcab1319de
81625894
9debianTag="debian/%e%%%V"
10patchedTag="patched/%e%%%V"
11upstreamTag="upstream/%U"
12signature:8b241dee85731fb19e57622f160a4326da52a7a7:683:openssh_8.1p1.orig.tar.gz.asc
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..76ce17f74
--- /dev/null
+++ b/debian/.gitlab-ci.yml
@@ -0,0 +1,12 @@
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
10 except:
11 variables:
12 - $CI_COMMIT_TAG != null
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 000000000..32a0c721e
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,274 @@
1openssh (1:8.1p1-1) unstable; urgency=medium
2
3 OpenSSH 8.1 includes a number of changes that may affect existing
4 configurations:
5
6 * ssh-keygen(1): when acting as a CA and signing certificates with an RSA
7 key, default to using the rsa-sha2-512 signature algorithm.
8 Certificates signed by RSA keys will therefore be incompatible with
9 OpenSSH versions prior to 7.2 unless the default is overridden (using
10 "ssh-keygen -t ssh-rsa -s ...").
11
12 -- Colin Watson <cjwatson@debian.org> Thu, 10 Oct 2019 10:23:19 +0100
13
14openssh (1:8.0p1-1) experimental; urgency=medium
15
16 OpenSSH 8.0 includes a number of changes that may affect existing
17 configurations:
18
19 * sshd(8): Remove support for obsolete "host/port" syntax.
20 Slash-separated host/port was added in 2001 as an alternative to
21 host:port syntax for the benefit of IPv6 users. These days there are
22 established standards for this like [::1]:22 and the slash syntax is
23 easily mistaken for CIDR notation, which OpenSSH supports for some
24 things. Remove the slash notation from ListenAddress and PermitOpen.
25
26 -- Colin Watson <cjwatson@debian.org> Sun, 09 Jun 2019 22:47:27 +0100
27
28openssh (1:7.9p1-1) unstable; urgency=medium
29
30 OpenSSH 7.9 includes a number of changes that may affect existing
31 configurations:
32
33 * ssh(1), sshd(8): the setting of the new CASignatureAlgorithms option
34 bans the use of DSA keys as certificate authorities.
35 * sshd(8): the authentication success/failure log message has changed
36 format slightly. It now includes the certificate fingerprint
37 (previously it included only key ID and CA key fingerprint).
38
39 -- Colin Watson <cjwatson@debian.org> Sun, 21 Oct 2018 10:39:24 +0100
40
41openssh (1:7.8p1-1) unstable; urgency=medium
42
43 OpenSSH 7.8 includes a number of changes that may affect existing
44 configurations:
45
46 * ssh-keygen(1): Write OpenSSH format private keys by default instead of
47 using OpenSSL's PEM format. The OpenSSH format, supported in OpenSSH
48 releases since 2014 and described in the PROTOCOL.key file in the
49 source distribution, offers substantially better protection against
50 offline password guessing and supports key comments in private keys.
51 If necessary, it is possible to write old PEM-style keys by adding "-m
52 PEM" to ssh-keygen's arguments when generating or updating a key.
53 * sshd(8): Remove internal support for S/Key multiple factor
54 authentication. S/Key may still be used via PAM or BSD auth.
55 * ssh(1): Remove vestigial support for running ssh(1) as setuid. This
56 used to be required for hostbased authentication and the (long gone)
57 rhosts-style authentication, but has not been necessary for a long
58 time. Attempting to execute ssh as a setuid binary, or with uid !=
59 effective uid will now yield a fatal error at runtime.
60 * sshd(8): The semantics of PubkeyAcceptedKeyTypes and the similar
61 HostbasedAcceptedKeyTypes options have changed. These now specify
62 signature algorithms that are accepted for their respective
63 authentication mechanism, where previously they specified accepted key
64 types. This distinction matters when using the RSA/SHA2 signature
65 algorithms "rsa-sha2-256", "rsa-sha2-512" and their certificate
66 counterparts. Configurations that override these options but omit
67 these algorithm names may cause unexpected authentication failures (no
68 action is required for configurations that accept the default for these
69 options).
70 * sshd(8): The precedence of session environment variables has changed.
71 ~/.ssh/environment and environment="..." options in authorized_keys
72 files can no longer override SSH_* variables set implicitly by sshd.
73 * ssh(1)/sshd(8): The default IPQoS used by ssh/sshd has changed. They
74 will now use DSCP AF21 for interactive traffic and CS1 for bulk. For a
75 detailed rationale, please see the commit message:
76 https://cvsweb.openbsd.org/src/usr.bin/ssh/readconf.c#rev1.284
77
78 -- Colin Watson <cjwatson@debian.org> Thu, 30 Aug 2018 15:35:27 +0100
79
80openssh (1:7.6p1-1) unstable; urgency=medium
81
82 OpenSSH 7.6 includes a number of changes that may affect existing
83 configurations:
84
85 * ssh(1): Delete SSH protocol version 1 support, associated configuration
86 options and documentation.
87 * ssh(1)/sshd(8): Remove support for the hmac-ripemd160 MAC.
88 * ssh(1)/sshd(8): Remove support for the arcfour, blowfish and CAST
89 ciphers.
90 * Refuse RSA keys <1024 bits in length and improve reporting for keys
91 that do not meet this requirement.
92 * ssh(1): Do not offer CBC ciphers by default.
93
94 -- Colin Watson <cjwatson@debian.org> Fri, 06 Oct 2017 12:36:48 +0100
95
96openssh (1:7.5p1-1) experimental; urgency=medium
97
98 OpenSSH 7.5 includes a number of changes that may affect existing
99 configurations:
100
101 * This release deprecates the sshd_config UsePrivilegeSeparation option,
102 thereby making privilege separation mandatory.
103
104 * The format of several log messages emitted by the packet code has
105 changed to include additional information about the user and their
106 authentication state. Software that monitors ssh/sshd logs may need to
107 account for these changes. For example:
108
109 Connection closed by user x 1.1.1.1 port 1234 [preauth]
110 Connection closed by authenticating user x 10.1.1.1 port 1234 [preauth]
111 Connection closed by invalid user x 1.1.1.1 port 1234 [preauth]
112
113 Affected messages include connection closure, timeout, remote
114 disconnection, negotiation failure and some other fatal messages
115 generated by the packet code.
116
117 -- Colin Watson <cjwatson@debian.org> Sun, 02 Apr 2017 02:58:01 +0100
118
119openssh (1:7.4p1-7) unstable; urgency=medium
120
121 This version restores the default for AuthorizedKeysFile to search both
122 ~/.ssh/authorized_keys and ~/.ssh/authorized_keys2, as was the case in
123 Debian configurations before 1:7.4p1-1. Upstream intends to phase out
124 searching ~/.ssh/authorized_keys2 by default, so you should ensure that
125 you are only using ~/.ssh/authorized_keys, at least for critical
126 administrative access; do not assume that the current default will remain
127 in place forever.
128
129 -- Colin Watson <cjwatson@debian.org> Sun, 05 Mar 2017 02:12:42 +0000
130
131openssh (1:7.4p1-1) unstable; urgency=medium
132
133 OpenSSH 7.4 includes a number of changes that may affect existing
134 configurations:
135
136 * ssh(1): Remove 3des-cbc from the client's default proposal. 64-bit
137 block ciphers are not safe in 2016 and we don't want to wait until
138 attacks like SWEET32 are extended to SSH. As 3des-cbc was the only
139 mandatory cipher in the SSH RFCs, this may cause problems connecting to
140 older devices using the default configuration, but it's highly likely
141 that such devices already need explicit configuration for key exchange
142 and hostkey algorithms already anyway.
143 * sshd(8): Remove support for pre-authentication compression. Doing
144 compression early in the protocol probably seemed reasonable in the
145 1990s, but today it's clearly a bad idea in terms of both cryptography
146 (cf. multiple compression oracle attacks in TLS) and attack surface.
147 Pre-auth compression support has been disabled by default for >10
148 years. Support remains in the client.
149 * ssh-agent will refuse to load PKCS#11 modules outside a whitelist of
150 trusted paths by default. The path whitelist may be specified at
151 run-time.
152 * sshd(8): When a forced-command appears in both a certificate and an
153 authorized keys/principals command= restriction, sshd will now refuse
154 to accept the certificate unless they are identical. The previous
155 (documented) behaviour of having the certificate forced-command
156 override the other could be a bit confusing and error-prone.
157 * sshd(8): Remove the UseLogin configuration directive and support for
158 having /bin/login manage login sessions.
159
160 The unprivileged sshd process that deals with pre-authentication network
161 traffic is now subject to additional sandboxing restrictions by default:
162 that is, the default sshd_config now sets UsePrivilegeSeparation to
163 "sandbox" rather than "yes". This has been the case upstream for a while,
164 but until now the Debian configuration diverged unnecessarily.
165
166 -- Colin Watson <cjwatson@debian.org> Tue, 27 Dec 2016 18:01:46 +0000
167
168openssh (1:7.2p1-1) unstable; urgency=medium
169
170 OpenSSH 7.2 disables a number of legacy cryptographic algorithms by
171 default in ssh:
172
173 * Several ciphers blowfish-cbc, cast128-cbc, all arcfour variants and the
174 rijndael-cbc aliases for AES.
175 * MD5-based and truncated HMAC algorithms.
176
177 These algorithms are already disabled by default in sshd.
178
179 -- Colin Watson <cjwatson@debian.org> Tue, 08 Mar 2016 11:47:20 +0000
180
181openssh (1:7.1p1-2) unstable; urgency=medium
182
183 OpenSSH 7.0 disables several pieces of weak, legacy, and/or unsafe
184 cryptography.
185
186 * Support for the legacy SSH version 1 protocol is disabled by default at
187 compile time. Note that this also means that the Cipher keyword in
188 ssh_config(5) is effectively no longer usable; use Ciphers instead for
189 protocol 2. The openssh-client-ssh1 package includes "ssh1", "scp1",
190 and "ssh-keygen1" binaries which you can use if you have no alternative
191 way to connect to an outdated SSH1-only server; please contact the
192 server administrator or system vendor in such cases and ask them to
193 upgrade.
194 * Support for the 1024-bit diffie-hellman-group1-sha1 key exchange is
195 disabled by default at run-time. It may be re-enabled using the
196 instructions at http://www.openssh.com/legacy.html
197 * Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled by
198 default at run-time. These may be re-enabled using the instructions at
199 http://www.openssh.com/legacy.html
200 * Support for the legacy v00 cert format has been removed.
201
202 Future releases will retire more legacy cryptography, including:
203
204 * Refusing all RSA keys smaller than 1024 bits (the current minimum is
205 768 bits).
206 * Several ciphers will be disabled by default: blowfish-cbc, cast128-cbc,
207 all arcfour variants, and the rijndael-cbc aliases for AES.
208 * MD5-based HMAC algorithms will be disabled by default.
209
210 -- Colin Watson <cjwatson@debian.org> Tue, 08 Dec 2015 15:33:08 +0000
211
212openssh (1:6.9p1-1) unstable; urgency=medium
213
214 UseDNS now defaults to 'no'. Configurations that match against the client
215 host name (via sshd_config or authorized_keys) may need to re-enable it or
216 convert to matching against addresses.
217
218 -- Colin Watson <cjwatson@debian.org> Thu, 20 Aug 2015 10:38:58 +0100
219
220openssh (1:6.7p1-5) unstable; urgency=medium
221
222 openssh-server 1:6.7p1-4 changed the default setting of AcceptEnv to list
223 a number of specific LC_FOO variables rather than the wildcard LC_*. I
224 have since been persuaded that this was a bad idea and have reverted it,
225 but it is difficult to automatically undo the change to
226 /etc/ssh/sshd_config without compounding the problem (that of modifying
227 configuration that some users did not want to be modified) further. Most
228 users who upgraded via version 1:6.7p1-4 should restore the previous value
229 of "AcceptEnv LANG LC_*" in /etc/ssh/sshd_config.
230
231 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:09:32 +0000
232
233openssh (1:5.4p1-2) unstable; urgency=low
234
235 Smartcard support is now available using PKCS#11 tokens. If you were
236 previously using an unofficial build of Debian's OpenSSH package with
237 OpenSC-based smartcard support added, then note that commands like
238 'ssh-add -s 0' will no longer work; you need to use 'ssh-add -s
239 /usr/lib/opensc-pkcs11.so' instead.
240
241 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
242
243openssh (1:3.8.1p1-9) experimental; urgency=low
244
245 The ssh package has been split into openssh-client and openssh-server. If
246 you had previously requested that the sshd server should not be run, then
247 that request will still be honoured. However, the recommended approach is
248 now to remove the openssh-server package if you do not want to run sshd.
249 You can remove the old /etc/ssh/sshd_not_to_be_run marker file after doing
250 that.
251
252 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
253
254openssh (1:3.5p1-1) unstable; urgency=low
255
256 This version of OpenSSH disables the environment option for public keys by
257 default, in order to avoid certain attacks (for example, LD_PRELOAD). If
258 you are using this option in an authorized_keys file, beware that the keys
259 in question will no longer work until the option is removed.
260
261 To re-enable this option, set "PermitUserEnvironment yes" in
262 /etc/ssh/sshd_config after the upgrade is complete, taking note of the
263 warning in the sshd_config(5) manual page.
264
265 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
266
267openssh (1:3.0.1p1-1) unstable; urgency=high
268
269 As of version 3, OpenSSH no longer uses separate files for ssh1 and ssh2
270 keys. This means the authorized_keys2 and known_hosts2 files are no longer
271 needed. They will still be read in order to maintain backward
272 compatibility.
273
274 -- 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..dbe6c2958
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,295 @@
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
273IPQoS defaults reverted to pre-7.8 values
274-----------------------------------------
275
276OpenSSH 7.8 changed the default IPQoS settings to use DSCP AF21 for
277interactive traffic and CS1 for bulk. This caused some problems with other
278software ("iptables -m tos" and VMware), so Debian's OpenSSH reverts this
279change for the time being.
280
281This is *temporary*, and we expect to come back into sync with upstream
282OpenSSH once those other issues have been fixed. If you want to restore the
283upstream default, add this to ssh_config and sshd_config:
284
285 IPQoS af21 cs1
286
287For further discussion, see:
288
289 https://bugs.debian.org/923879
290 https://bugs.debian.org/926229
291 https://bugs.launchpad.net/1822370
292
293--
294Matthew Vernon <matthew@debian.org>
295Colin 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..60660a0d3
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5708 @@
1openssh (1:8.1p1-5) UNRELEASED; urgency=medium
2
3 * Apply upstream patches to allow clock_nanosleep() and variants in the
4 seccomp sandbox, fixing failures with glibc 2.31.
5
6 -- Colin Watson <cjwatson@debian.org> Sat, 11 Jan 2020 23:27:35 +0000
7
8openssh (1:8.1p1-4) unstable; urgency=medium
9
10 * Apply upstream patch to stop using 2020 as a future date in regress
11 tests.
12
13 -- Colin Watson <cjwatson@debian.org> Thu, 09 Jan 2020 11:42:10 +0000
14
15openssh (1:8.1p1-3) unstable; urgency=medium
16
17 [ Colin Watson ]
18 * Drop suggestion of rssh, since it's been removed (see
19 https://bugs.debian.org/923691).
20
21 [ Steve Langasek ]
22 * Don't build openssh-tests on Ubuntu i386 (closes: #948466).
23
24 -- Colin Watson <cjwatson@debian.org> Thu, 09 Jan 2020 00:29:58 +0000
25
26openssh (1:8.1p1-2) unstable; urgency=medium
27
28 * Drop "Allow flock and ipc syscall for s390 architecture" patch for now;
29 upstream has security concerns with it and it doesn't currently seem to
30 be needed.
31 * Mark openssh-sftp-server, openssh-tests, ssh, and ssh-askpass-gnome as
32 Multi-Arch: foreign; none of them provide any architecture-dependent
33 interfaces.
34
35 -- Colin Watson <cjwatson@debian.org> Wed, 11 Dec 2019 23:53:49 +0000
36
37openssh (1:8.1p1-1) unstable; urgency=medium
38
39 * New upstream release (https://www.openssh.com/txt/release-8.1):
40 - ssh(1), sshd(8), ssh-agent(1): Add protection for private keys at rest
41 in RAM against speculation and memory side-channel attacks like
42 Spectre, Meltdown and Rambleed. This release encrypts private keys
43 when they are not in use with a symmetric key that is derived from a
44 relatively large "prekey" consisting of random data (currently 16KB).
45 - ssh(1): Allow %n to be expanded in ProxyCommand strings.
46 - ssh(1), sshd(8): Allow prepending a list of algorithms to the default
47 set by starting the list with the '^' character, e.g.
48 "HostKeyAlgorithms ^ssh-ed25519".
49 - ssh-keygen(1): Add an experimental lightweight signature and
50 verification ability. Signatures may be made using regular ssh keys
51 held on disk or stored in a ssh-agent and verified against an
52 authorized_keys-like list of allowed keys. Signatures embed a
53 namespace that prevents confusion and attacks between different usage
54 domains (e.g. files vs email).
55 - ssh-keygen(1): Print key comment when extracting public key from a
56 private key.
57 - ssh-keygen(1): Accept the verbose flag when searching for host keys in
58 known hosts (i.e. "ssh-keygen -vF host") to print the matching host's
59 random-art signature too.
60 - All: Support PKCS8 as an optional format for storage of private keys
61 to disk. The OpenSSH native key format remains the default, but PKCS8
62 is a superior format to PEM if interoperability with non-OpenSSH
63 software is required, as it may use a less insecure key derivation
64 function than PEM's.
65 - ssh(1): If a PKCS#11 token returns no keys then try to login and
66 refetch them.
67 - ssh(1): Produce a useful error message if the user's shell is set
68 incorrectly during "match exec" processing.
69 - sftp(1): Allow the maximum uint32 value for the argument passed to -b
70 which allows better error messages from later validation.
71 - ssh-keyscan(1): Include SHA2-variant RSA key algorithms in KEX
72 proposal; allows ssh-keyscan to harvest keys from servers that disable
73 old SHA1 ssh-rsa.
74 - sftp(1): Print explicit "not modified" message if a file was requested
75 for resumed download but was considered already complete.
76 - sftp(1): Fix a typo and make <esc><right> move right to the closest
77 end of a word just like <esc><left> moves left to the closest
78 beginning of a word.
79 - sshd(8): Cap the number of permitopen/permitlisten directives allowed
80 to appear on a single authorized_keys line.
81 - All: Fix a number of memory leaks (one-off or on exit paths).
82 - ssh(1), sshd(8): Check for convtime() refusing to accept times that
83 resolve to LONG_MAX.
84 - ssh(1): Slightly more instructive error message when the user
85 specifies multiple -J options on the command-line (closes: #929669).
86 - ssh-agent(1): Process agent requests for RSA certificate private keys
87 using correct signature algorithm when requested.
88 - sftp(1): Check for user@host when parsing sftp target. This allows
89 user@[1.2.3.4] to work without a path.
90 - sshd(8): Enlarge format buffer size for certificate serial number so
91 the log message can record any 64-bit integer without truncation.
92 - sshd(8): For PermitOpen violations add the remote host and port to be
93 able to more easily ascertain the source of the request. Add the same
94 logging for PermitListen violations which were not previously logged
95 at all.
96 - scp(1), sftp(1): Use the correct POSIX format style for left
97 justification for the transfer progress meter.
98 - sshd(8): When examining a configuration using sshd -T, assume any
99 attribute not provided by -C does not match, which allows it to work
100 when sshd_config contains a Match directive with or without -C.
101 - ssh(1), ssh-keygen(1): Downgrade PKCS#11 "provider returned no slots"
102 warning from log level error to debug. This is common when attempting
103 to enumerate keys on smartcard readers with no cards plugged in.
104 - ssh(1), ssh-keygen(1): Do not unconditionally log in to PKCS#11
105 tokens. Avoids spurious PIN prompts for keys not selected for
106 authentication in ssh(1) and when listing public keys available in a
107 token using ssh-keygen(1).
108 - ssh(1), sshd(8): Fix typo that prevented detection of Linux VRF.
109 - sshd(8): In the Linux seccomp-bpf sandbox, allow mprotect(2) with
110 PROT_(READ|WRITE|NONE) only. This syscall is used by some hardened
111 heap allocators.
112 - sshd(8): In the Linux seccomp-bpf sandbox, allow the s390-specific
113 ioctl for ECC hardware support.
114 * Re-enable hardening on hppa, since the corresponding GCC bug is
115 apparently fixed.
116
117 -- Colin Watson <cjwatson@debian.org> Thu, 10 Oct 2019 10:23:19 +0100
118
119openssh (1:8.0p1-7) unstable; urgency=medium
120
121 [ Daniel Kahn Gillmor ]
122 * runit: Correct typo in comment.
123
124 [ Colin Watson ]
125 * Apply upstream patch to deny (non-fatally) shmget/shmat/shmdt in preauth
126 privsep child, coping with changes in OpenSSL 1.1.1d that broke OpenSSH
127 on Linux kernels before 3.19 (closes: #941663).
128
129 -- Colin Watson <cjwatson@debian.org> Sat, 05 Oct 2019 22:41:11 +0100
130
131openssh (1:8.0p1-6) unstable; urgency=medium
132
133 * Only run dh_runit on openssh-server (closes: #935936).
134
135 -- Colin Watson <cjwatson@debian.org> Wed, 28 Aug 2019 10:53:18 +0100
136
137openssh (1:8.0p1-5) unstable; urgency=medium
138
139 [ Lorenzo Puliti ]
140 * Add a runscript for runit (closes: #933999).
141
142 -- Colin Watson <cjwatson@debian.org> Tue, 27 Aug 2019 15:18:54 +0100
143
144openssh (1:8.0p1-4) unstable; urgency=medium
145
146 * Use debhelper-compat instead of debian/compat.
147 * debian/*.apport:
148 - Remove #! lines.
149 - Avoid star imports.
150 - Fix flake8 errors.
151 * Run regression tests against the Python 3 version of Twisted Conch.
152
153 -- Colin Watson <cjwatson@debian.org> Sat, 03 Aug 2019 13:33:24 +0100
154
155openssh (1:8.0p1-3) unstable; urgency=medium
156
157 * Upload to unstable.
158
159 -- Colin Watson <cjwatson@debian.org> Mon, 08 Jul 2019 17:19:37 +0100
160
161openssh (1:8.0p1-2) experimental; urgency=medium
162
163 * Fix interop tests for recent regress changes.
164
165 -- Colin Watson <cjwatson@debian.org> Fri, 14 Jun 2019 14:32:12 +0100
166
167openssh (1:8.0p1-1) experimental; urgency=medium
168
169 * New upstream release (https://www.openssh.com/txt/release-8.0, closes:
170 #927792):
171 - ssh(1), ssh-agent(1), ssh-add(1): Add support for ECDSA keys in
172 PKCS#11 tokens (LP: #1665695).
173 - ssh(1), sshd(8): Add experimental quantum-computing resistant key
174 exchange method, based on a combination of Streamlined NTRU Prime
175 4591^761 and X25519.
176 - ssh-keygen(1): Increase the default RSA key size to 3072 bits,
177 following NIST Special Publication 800-57's guidance for a 128-bit
178 equivalent symmetric security level (LP: #1445625).
179 - ssh(1): Allow "PKCS11Provider=none" to override later instances of the
180 PKCS11Provider directive in ssh_config.
181 - sshd(8): Add a log message for situations where a connection is
182 dropped for attempting to run a command but a sshd_config
183 ForceCommand=internal-sftp restriction is in effect.
184 - ssh(1): When prompting whether to record a new host key, accept the
185 key fingerprint as a synonym for "yes". This allows the user to paste
186 a fingerprint obtained out of band at the prompt and have the client
187 do the comparison for you.
188 - ssh-keygen(1): When signing multiple certificates on a single
189 command-line invocation, allow automatically incrementing the
190 certificate serial number.
191 - scp(1), sftp(1): Accept -J option as an alias to ProxyJump on the scp
192 and sftp command-lines.
193 - ssh-agent(1), ssh-pkcs11-helper(8), ssh-add(1): Accept "-v"
194 command-line flags to increase the verbosity of output; pass verbose
195 flags though to subprocesses, such as ssh-pkcs11-helper started from
196 ssh-agent.
197 - ssh-add(1): Add a "-T" option to allowing testing whether keys in an
198 agent are usable by performing a signature and a verification.
199 - sftp-server(8): Add a "lsetstat@openssh.com" protocol extension that
200 replicates the functionality of the existing SSH2_FXP_SETSTAT
201 operation but does not follow symlinks.
202 - sftp(1): Add "-h" flag to chown/chgrp/chmod commands to request they
203 do not follow symlinks.
204 - sshd(8): Expose $SSH_CONNECTION in the PAM environment. This makes
205 the connection 4-tuple available to PAM modules that wish to use it in
206 decision-making.
207 - sshd(8): Add a ssh_config "Match final" predicate. Matches in same
208 pass as "Match canonical" but doesn't require hostname
209 canonicalisation be enabled.
210 - sftp(1): Support a prefix of '@' to suppress echo of sftp batch
211 commands.
212 - ssh-keygen(1): When printing certificate contents using "ssh-keygen
213 -Lf /path/certificate", include the algorithm that the CA used to sign
214 the cert.
215 - sshd(8): Fix authentication failures when sshd_config contains
216 "AuthenticationMethods any" inside a Match block that overrides a more
217 restrictive default.
218 - sshd(8): Avoid sending duplicate keepalives when ClientAliveCount is
219 enabled.
220 - sshd(8): Fix two race conditions related to SIGHUP daemon restart.
221 Remnant file descriptors in recently-forked child processes could
222 block the parent sshd's attempt to listen(2) to the configured
223 addresses. Also, the restarting parent sshd could exit before any
224 child processes that were awaiting their re-execution state had
225 completed reading it, leaving them in a fallback path.
226 - ssh(1): Fix stdout potentially being redirected to /dev/null when
227 ProxyCommand=- was in use.
228 - sshd(8): Avoid sending SIGPIPE to child processes if they attempt to
229 write to stderr after their parent processes have exited.
230 - ssh(1): Fix bad interaction between the ssh_config ConnectTimeout and
231 ConnectionAttempts directives - connection attempts after the first
232 were ignoring the requested timeout (LP: #1798049).
233 - ssh-keyscan(1): Return a non-zero exit status if no keys were found
234 (closes: #374980, LP: #1661745).
235 - scp(1): Sanitize scp filenames to allow UTF-8 characters without
236 terminal control sequences.
237 - sshd(8): Fix confusion between ClientAliveInterval and time-based
238 RekeyLimit that could cause connections to be incorrectly closed.
239 - ssh(1), ssh-add(1): Correct some bugs in PKCS#11 token PIN handling at
240 initial token login. The attempt to read the PIN could be skipped in
241 some cases, particularly on devices with integrated PIN readers. This
242 would lead to an inability to retrieve keys from these tokens.
243 - ssh(1), ssh-add(1): Support keys on PKCS#11 tokens that set the
244 CKA_ALWAYS_AUTHENTICATE flag by requring a fresh login after the
245 C_SignInit operation.
246 - ssh(1): Improve documentation for ProxyJump/-J, clarifying that local
247 configuration does not apply to jump hosts.
248 - ssh-keygen(1): Clarify manual - ssh-keygen -e only writes public keys,
249 not private.
250 - ssh(1), sshd(8): be more strict in processing protocol banners,
251 allowing \r characters only immediately before \n.
252 - Various: fix a number of memory leaks.
253 - scp(1), sftp(1): fix calculation of initial bandwidth limits. Account
254 for bytes written before the timer starts and adjust the schedule on
255 which recalculations are performed. Avoids an initial burst of
256 traffic and yields more accurate bandwidth limits.
257 - sshd(8): Only consider the ext-info-c extension during the initial key
258 eschange. It shouldn't be sent in subsequent ones, but if it is
259 present we should ignore it. This prevents sshd from sending a
260 SSH_MSG_EXT_INFO for REKEX for these buggy clients.
261 - ssh-keygen(1): Clarify manual that ssh-keygen -F (find host in
262 authorized_keys) and -R (remove host from authorized_keys) options may
263 accept either a bare hostname or a [hostname]:port combo.
264 - ssh(1): Don't attempt to connect to empty SSH_AUTH_SOCK.
265 - sshd(8): Silence error messages when sshd fails to load some of the
266 default host keys. Failure to load an explicitly-configured hostkey
267 is still an error, and failure to load any host key is still fatal.
268 - ssh(1): Redirect stderr of ProxyCommands to /dev/null when ssh is
269 started with ControlPersist; prevents random ProxyCommand output from
270 interfering with session output.
271 - ssh(1): The ssh client was keeping a redundant ssh-agent socket
272 (leftover from authentication) around for the life of the connection.
273 - sshd(8): Fix bug in HostbasedAcceptedKeyTypes and
274 PubkeyAcceptedKeyTypes options. If only RSA-SHA2 signature types were
275 specified, then authentication would always fail for RSA keys as the
276 monitor checks only the base key (not the signature algorithm) type
277 against *AcceptedKeyTypes.
278 - ssh(1): Request correct signature types from ssh-agent when
279 certificate keys and RSA-SHA2 signatures are in use.
280 - sshd(8): Don't set $MAIL if UsePAM=yes as PAM typically specifies the
281 user environment if it's enabled (closes: #189920, #532754).
282 * Mostly resynced GSSAPI key exchange patch with Fedora. Major changes:
283 - Support selection of GSSAPI key exchange algorithms.
284 - Support GSSAPI key exchange methods with DH and SHA2.
285 - Support GSSAPI key exchange using ECDH and SHA2.
286 - Make sure the Kerberos tickets are cleaned up with the user context.
287 - Enable gssapi-keyex authentication without gssapi-with-mic.
288 - Allow querying for GSSAPI key exchange algorithms from ssh (-Q
289 kex-gss).
290 * Apply upstream patch to fix the utimensat regression tests when not
291 using the compatibility implementation.
292
293 -- Colin Watson <cjwatson@debian.org> Sun, 09 Jun 2019 22:47:27 +0100
294
295openssh (1:7.9p1-10) unstable; urgency=medium
296
297 * Temporarily revert IPQoS defaults to pre-7.8 values until issues with
298 "iptables -m tos" and VMware have been fixed (closes: #923879, #926229;
299 LP: #1822370).
300
301 -- Colin Watson <cjwatson@debian.org> Mon, 08 Apr 2019 11:13:04 +0100
302
303openssh (1:7.9p1-9) unstable; urgency=medium
304
305 * Apply upstream patch to make scp handle shell-style brace expansions
306 when checking that filenames sent by the server match what the client
307 requested (closes: #923486).
308
309 -- Colin Watson <cjwatson@debian.org> Fri, 01 Mar 2019 12:23:36 +0000
310
311openssh (1:7.9p1-8) unstable; urgency=medium
312
313 [ Colin Watson ]
314 * Apply upstream patch to fix bug in HostbasedAcceptedKeyTypes and
315 PubkeyAcceptedKeyTypes options in the case where only RSA-SHA2 signature
316 types were specified.
317 * Apply upstream patch to request RSA-SHA2 signatures for
318 rsa-sha2-{256|512}-cert-v01@openssh.com cert algorithms (closes:
319 #923419).
320 * Move moduli(5) manual page to openssh-server to go with /etc/ssh/moduli;
321 forgotten in 1:7.9p1-5.
322
323 [ Dominik George ]
324 * Correctly handle conffile move to openssh-server (closes: #919344).
325
326 -- Colin Watson <cjwatson@debian.org> Thu, 28 Feb 2019 19:31:49 +0000
327
328openssh (1:7.9p1-7) unstable; urgency=medium
329
330 * Recommend "default-logind | logind | libpam-systemd" rather than just
331 libpam-systemd (closes: #923199). (I've retained libpam-systemd as an
332 alternative for a while to avoid backporting accidents, although it can
333 be removed later.)
334 * Pass "--exec /usr/sbin/sshd" to start-stop-daemon on stop as well as
335 start and pass "--chuid 0:0" on start, to avoid problems with non-root
336 groups leaking into the ownership of /run/sshd.pid (closes: #922365).
337
338 -- Colin Watson <cjwatson@debian.org> Tue, 26 Feb 2019 15:13:23 +0000
339
340openssh (1:7.9p1-6) unstable; urgency=medium
341
342 * CVE-2019-6109: Apply upstream patches to sanitize scp filenames via
343 snmprintf (closes: #793412).
344 * CVE-2019-6111: Apply upstream patch to check in scp client that
345 filenames sent during remote->local directory copies satisfy the
346 wildcard specified by the user.
347
348 -- Colin Watson <cjwatson@debian.org> Fri, 08 Feb 2019 16:26:35 +0000
349
350openssh (1:7.9p1-5) unstable; urgency=high
351
352 * Move /etc/ssh/moduli to openssh-server, since it's reasonably large and
353 only used by sshd (closes: #858050).
354 * Drop obsolete alternate build-dependency on libssl1.0-dev (closes:
355 #917342).
356 * CVE-2018-20685: Apply upstream scp patch to disallow empty incoming
357 filename or ones that refer to the current directory (closes: #919101).
358
359 -- Colin Watson <cjwatson@debian.org> Sun, 13 Jan 2019 11:22:45 +0000
360
361openssh (1:7.9p1-4) unstable; urgency=medium
362
363 * Fix Ubuntu detection in debian/rules, since the documentation comment
364 for dpkg_vendor_derives_from is wrong (thanks, Jeremy Bicha; see
365 #913816).
366
367 -- Colin Watson <cjwatson@debian.org> Fri, 16 Nov 2018 11:27:28 +0000
368
369openssh (1:7.9p1-3) unstable; urgency=medium
370
371 * Be more specific about what files to install in openssh-tests, to avoid
372 installing a symlink into the build tree.
373 * Re-export debian/upstream/signing-key.asc without extra signatures.
374 * Restore direct test dependencies on openssl, putty-tools, and
375 python-twisted-conch; these are really only indirect dependencies via
376 openssh-tests, but including them means that this package will be
377 retested when they change.
378
379 -- Colin Watson <cjwatson@debian.org> Thu, 15 Nov 2018 01:30:56 +0000
380
381openssh (1:7.9p1-2) unstable; urgency=medium
382
383 * Add GitLab CI configuration.
384 * Make the autopkgtest create /run/sshd if it doesn't already exist.
385 * Drop "set -x" verbosity from the autopkgtest; I think we can do without
386 this in most cases nowadays.
387 * Add an openssh-tests binary package containing enough files to run the
388 upstream regression tests. This allows autopkgtest to run more
389 efficiently, as it doesn't have to build part of the source tree again.
390
391 -- Colin Watson <cjwatson@debian.org> Wed, 14 Nov 2018 15:55:48 +0000
392
393openssh (1:7.9p1-1) unstable; urgency=medium
394
395 * New upstream release (https://www.openssh.com/txt/release-7.9):
396 - ssh(1), sshd(8): allow most port numbers to be specified using service
397 names from getservbyname(3) (typically /etc/services; closes:
398 #177406).
399 - ssh(1): allow the IdentityAgent configuration directive to accept
400 environment variable names. This supports the use of multiple agent
401 sockets without needing to use fixed paths.
402 - sshd(8): support signalling sessions via the SSH protocol. A limited
403 subset of signals is supported and only for login or command sessions
404 (i.e. not subsystems) that were not subject to a forced command via
405 authorized_keys or sshd_config.
406 - ssh(1): support "ssh -Q sig" to list supported signature options.
407 Also "ssh -Q help" to show the full set of supported queries.
408 - ssh(1), sshd(8): add a CASignatureAlgorithms option for the client and
409 server configs to allow control over which signature formats are
410 allowed for CAs to sign certificates. For example, this allows
411 banning CAs that sign certificates using the RSA-SHA1 signature
412 algorithm.
413 - sshd(8), ssh-keygen(1): allow key revocation lists (KRLs) to revoke
414 keys specified by SHA256 hash.
415 - ssh-keygen(1): allow creation of key revocation lists directly from
416 base64-encoded SHA256 fingerprints. This supports revoking keys using
417 only the information contained in sshd(8) authentication log messages.
418 - ssh(1), ssh-keygen(1): avoid spurious "invalid format" errors when
419 attempting to load PEM private keys while using an incorrect
420 passphrase.
421 - sshd(8): when a channel closed message is received from a client,
422 close the stderr file descriptor at the same time stdout is closed.
423 This avoids stuck processes if they were waiting for stderr to close
424 and were insensitive to stdin/out closing (closes: #844494).
425 - ssh(1): allow ForwardX11Timeout=0 to disable the untrusted X11
426 forwarding timeout and support X11 forwarding indefinitely.
427 Previously the behaviour of ForwardX11Timeout=0 was undefined.
428 - sshd(8): when compiled with GSSAPI support, cache supported method
429 OIDs regardless of whether GSSAPI authentication is enabled in the
430 main section of sshd_config. This avoids sandbox violations if GSSAPI
431 authentication was later enabled in a Match block.
432 - sshd(8): do not fail closed when configured with a text key revocation
433 list that contains a too-short key.
434 - ssh(1): treat connections with ProxyJump specified the same as ones
435 with a ProxyCommand set with regards to hostname canonicalisation
436 (i.e. don't try to canonicalise the hostname unless
437 CanonicalizeHostname is set to 'always').
438 - ssh(1): fix regression in OpenSSH 7.8 that could prevent public-key
439 authentication using certificates hosted in a ssh-agent(1) or against
440 sshd(8) from OpenSSH <7.8 (LP: #1790963).
441 - All: support building against the openssl-1.1 API (releases 1.1.0g and
442 later). The openssl-1.0 API will remain supported at least until
443 OpenSSL terminates security patch support for that API version
444 (closes: #828475).
445 - sshd(8): allow the futex(2) syscall in the Linux seccomp sandbox;
446 apparently required by some glibc/OpenSSL combinations.
447 * Remove dh_builddeb override to use xz compression; this has been the
448 default since dpkg 1.17.0.
449 * Simplify debian/rules using /usr/share/dpkg/default.mk.
450 * Remove /etc/network/if-up.d/openssh-server, as it causes more problems
451 than it solves (thanks, Christian Ehrhardt, Andreas Hasenack, and David
452 Britton; closes: #789532, LP: #1037738, #1674330, #1718227). Add an
453 "if-up hook removed" section to README.Debian documenting the corner
454 case that may need configuration adjustments.
455
456 -- Colin Watson <cjwatson@debian.org> Sun, 21 Oct 2018 10:39:24 +0100
457
458openssh (1:7.8p1-1) unstable; urgency=medium
459
460 * New upstream release (https://www.openssh.com/txt/release-7.8, closes:
461 #907534):
462 - ssh-keygen(1): Write OpenSSH format private keys by default instead of
463 using OpenSSL's PEM format (closes: #905407). The OpenSSH format,
464 supported in OpenSSH releases since 2014 and described in the
465 PROTOCOL.key file in the source distribution, offers substantially
466 better protection against offline password guessing and supports key
467 comments in private keys. If necessary, it is possible to write old
468 PEM-style keys by adding "-m PEM" to ssh-keygen's arguments when
469 generating or updating a key.
470 - sshd(8): Remove internal support for S/Key multiple factor
471 authentication. S/Key may still be used via PAM or BSD auth.
472 - ssh(1): Remove vestigial support for running ssh(1) as setuid. This
473 used to be required for hostbased authentication and the (long gone)
474 rhosts-style authentication, but has not been necessary for a long
475 time. Attempting to execute ssh as a setuid binary, or with uid !=
476 effective uid will now yield a fatal error at runtime.
477 - sshd(8): The semantics of PubkeyAcceptedKeyTypes and the similar
478 HostbasedAcceptedKeyTypes options have changed. These now specify
479 signature algorithms that are accepted for their respective
480 authentication mechanism, where previously they specified accepted key
481 types. This distinction matters when using the RSA/SHA2 signature
482 algorithms "rsa-sha2-256", "rsa-sha2-512" and their certificate
483 counterparts. Configurations that override these options but omit
484 these algorithm names may cause unexpected authentication failures (no
485 action is required for configurations that accept the default for
486 these options).
487 - sshd(8): The precedence of session environment variables has changed.
488 ~/.ssh/environment and environment="..." options in authorized_keys
489 files can no longer override SSH_* variables set implicitly by sshd.
490 - ssh(1)/sshd(8): The default IPQoS used by ssh/sshd has changed. They
491 will now use DSCP AF21 for interactive traffic and CS1 for bulk. For
492 a detailed rationale, please see the commit message:
493 https://cvsweb.openbsd.org/src/usr.bin/ssh/readconf.c#rev1.284
494 - ssh(1)/sshd(8): Add new signature algorithms "rsa-sha2-256-cert-
495 v01@openssh.com" and "rsa-sha2-512-cert-v01@openssh.com" to explicitly
496 force use of RSA/SHA2 signatures in authentication.
497 - sshd(8): Extend the PermitUserEnvironment option to accept a whitelist
498 of environment variable names in addition to global "yes" or "no"
499 settings.
500 - sshd(8): Add a PermitListen directive to sshd_config(5) and a
501 corresponding permitlisten= authorized_keys option that control which
502 listen addresses and port numbers may be used by remote forwarding
503 (ssh -R ...).
504 - sshd(8): Add some countermeasures against timing attacks used for
505 account validation/enumeration. sshd will enforce a minimum time or
506 each failed authentication attempt consisting of a global 5ms minimum
507 plus an additional per-user 0-4ms delay derived from a host secret.
508 - sshd(8): Add a SetEnv directive to allow an administrator to
509 explicitly specify environment variables in sshd_config. Variables
510 set by SetEnv override the default and client-specified environment.
511 - ssh(1): Add a SetEnv directive to request that the server sets an
512 environment variable in the session. Similar to the existing SendEnv
513 option, these variables are set subject to server configuration.
514 - ssh(1): Allow "SendEnv -PATTERN" to clear environment variables
515 previously marked for sending to the server (closes: #573316).
516 - ssh(1)/sshd(8): Make UID available as a %-expansion everywhere that
517 the username is available currently.
518 - ssh(1): Allow setting ProxyJump=none to disable ProxyJump
519 functionality.
520 - sshd(8): Avoid observable differences in request parsing that could be
521 used to determine whether a target user is valid.
522 - ssh(1)/sshd(8): Fix some memory leaks.
523 - ssh(1): Fix a pwent clobber (introduced in openssh-7.7) that could
524 occur during key loading, manifesting as crash on some platforms.
525 - sshd_config(5): Clarify documentation for AuthenticationMethods
526 option.
527 - ssh(1): Ensure that the public key algorithm sent in a public key
528 SSH_MSG_USERAUTH_REQUEST matches the content of the signature blob.
529 Previously, these could be inconsistent when a legacy or non-OpenSSH
530 ssh-agent returned a RSA/SHA1 signature when asked to make a RSA/SHA2
531 signature.
532 - sshd(8): Fix failures to read authorized_keys caused by faulty
533 supplemental group caching.
534 - scp(1): Apply umask to directories, fixing potential mkdir/chmod race
535 when copying directory trees.
536 - ssh-keygen(1): Return correct exit code when searching for and hashing
537 known_hosts entries in a single operation.
538 - ssh(1): Prefer the ssh binary pointed to via argv[0] to $PATH when
539 re-executing ssh for ProxyJump.
540 - sshd(8): Do not ban PTY allocation when a sshd session is restricted
541 because the user password is expired as it breaks password change
542 dialog.
543 - ssh(1)/sshd(8): Fix error reporting from select() failures.
544 - ssh(1): Improve documentation for -w (tunnel) flag, emphasising that
545 -w implicitly sets Tunnel=point-to-point.
546 - ssh-agent(1): Implement EMFILE mitigation for ssh-agent. ssh-agent
547 will no longer spin when its file descriptor limit is exceeded.
548 - ssh(1)/sshd(8): Disable SSH2_MSG_DEBUG messages for Twisted Conch
549 clients. Twisted Conch versions that lack a version number in their
550 identification strings will mishandle these messages when running on
551 Python 2.x (https://twistedmatrix.com/trac/ticket/9422).
552 - sftp(1): Notify user immediately when underlying ssh process dies
553 expectedly.
554 - ssh(1)/sshd(8): Fix tunnel forwarding; regression in 7.7 release.
555 - ssh-agent(1): Don't kill ssh-agent's listening socket entirely if it
556 fails to accept(2) a connection.
557 - ssh(1): Add some missing options in the configuration dump output (ssh
558 -G).
559 - sshd(8): Expose details of completed authentication to PAM auth
560 modules via SSH_AUTH_INFO_0 in the PAM environment.
561 * Switch debian/watch to HTTPS.
562 * Temporarily work around https://twistedmatrix.com/trac/ticket/9515 in
563 regression tests.
564
565 -- Colin Watson <cjwatson@debian.org> Thu, 30 Aug 2018 15:35:27 +0100
566
567openssh (1:7.7p1-4) unstable; urgency=high
568
569 * CVE-2018-15473: Apply upstream patch to delay bailout for invalid
570 authenticating user until after the packet containing the request has
571 been fully parsed (closes: #906236).
572
573 -- Colin Watson <cjwatson@debian.org> Fri, 17 Aug 2018 14:09:32 +0100
574
575openssh (1:7.7p1-3) unstable; urgency=medium
576
577 [ Colin Watson ]
578 * Adjust git-dpm tagging configuration.
579 * Remove no-longer-used Lintian overrides from openssh-server and ssh.
580 * Add Documentation keys to ssh-agent.service, ssh.service, and
581 ssh@.service.
582
583 [ Juri Grabowski ]
584 * Add rescue.target with ssh support.
585
586 [ Christian Ehrhardt ]
587 * Fix unintentional restriction of authorized keys environment options
588 to be alphanumeric (closes: #903474, LP: #1771011).
589
590 -- Colin Watson <cjwatson@debian.org> Tue, 10 Jul 2018 16:07:16 +0100
591
592openssh (1:7.7p1-2) unstable; urgency=medium
593
594 * Fix parsing of DebianBanner option (closes: #894730).
595
596 -- Colin Watson <cjwatson@debian.org> Wed, 04 Apr 2018 00:47:29 +0100
597
598openssh (1:7.7p1-1) unstable; urgency=medium
599
600 * New upstream release (https://www.openssh.com/txt/release-7.7):
601 - ssh(1)/sshd(8): Drop compatibility support for some very old SSH
602 implementations, including ssh.com <=2.* and OpenSSH <= 3.*. These
603 versions were all released in or before 2001 and predate the final SSH
604 RFCs. The support in question isn't necessary for RFC-compliant SSH
605 implementations.
606 - Add experimental support for PQC XMSS keys (Extended Hash-Based
607 Signatures).
608 - sshd(8): Add an "rdomain" criterion for the sshd_config Match keyword
609 to allow conditional configuration that depends on which routing
610 domain a connection was received on.
611 - sshd_config(5): Add an optional rdomain qualifier to the ListenAddress
612 directive to allow listening on different routing domains.
613 - sshd(8): Add "expiry-time" option for authorized_keys files to allow
614 for expiring keys.
615 - ssh(1): Add a BindInterface option to allow binding the outgoing
616 connection to an interface's address (basically a more usable
617 BindAddress; closes: #289592).
618 - ssh(1): Expose device allocated for tun/tap forwarding via a new %T
619 expansion for LocalCommand. This allows LocalCommand to be used to
620 prepare the interface.
621 - sshd(8): Expose the device allocated for tun/tap forwarding via a new
622 SSH_TUNNEL environment variable. This allows automatic setup of the
623 interface and surrounding network configuration automatically on the
624 server.
625 - ssh(1)/scp(1)/sftp(1): Add URI support to ssh, sftp and scp, e.g.
626 ssh://user@host or sftp://user@host/path. Additional connection
627 parameters described in draft-ietf-secsh-scp-sftp-ssh-uri-04 are not
628 implemented since the ssh fingerprint format in the draft uses the
629 deprecated MD5 hash with no way to specify any other algorithm.
630 - ssh-keygen(1): Allow certificate validity intervals that specify only
631 a start or stop time (instead of both or neither).
632 - sftp(1): Allow "cd" and "lcd" commands with no explicit path argument.
633 lcd will change to the local user's home directory as usual. cd will
634 change to the starting directory for session (because the protocol
635 offers no way to obtain the remote user's home directory).
636 - sshd(8): When doing a config test with sshd -T, only require the
637 attributes that are actually used in Match criteria rather than (an
638 incomplete list of) all criteria.
639 - ssh(1)/sshd(8): More strictly check signature types during key
640 exchange against what was negotiated. Prevents downgrade of RSA
641 signatures made with SHA-256/512 to SHA-1.
642 - sshd(8): Fix support for client that advertise a protocol version of
643 "1.99" (indicating that they are prepared to accept both SSHv1 and
644 SSHv2). This was broken in OpenSSH 7.6 during the removal of SSHv1
645 support.
646 - ssh(1): Warn when the agent returns a ssh-rsa (SHA1) signature when a
647 rsa-sha2-256/512 signature was requested. This condition is possible
648 when an old or non-OpenSSH agent is in use.
649 - ssh-agent(1): Fix regression introduced in 7.6 that caused ssh-agent
650 to fatally exit if presented an invalid signature request message.
651 - sshd_config(5): Accept yes/no flag options case-insensitively, as has
652 been the case in ssh_config(5) for a long time (LP: #1656557).
653 - ssh(1): Improve error reporting for failures during connection. Under
654 some circumstances misleading errors were being shown.
655 - ssh-keyscan(1): Add -D option to allow printing of results directly in
656 SSHFP format.
657 - ssh(1): Compatibility fix for some servers that erroneously drop the
658 connection when the IUTF8 (RFC8160) option is sent.
659 - scp(1): Disable RemoteCommand and RequestTTY in the ssh session
660 started by scp (sftp was already doing this).
661 - ssh-keygen(1): Refuse to create a certificate with an unusable number
662 of principals.
663 - ssh-keygen(1): Fatally exit if ssh-keygen is unable to write all the
664 public key during key generation. Previously it would silently ignore
665 errors writing the comment and terminating newline.
666 - ssh(1): Do not modify hostname arguments that are addresses by
667 automatically forcing them to lower-case. Instead canonicalise them
668 jo resolve ambiguities (e.g. ::0001 => ::1) before they are matched
669 against known_hosts.
670 - ssh(1): Don't accept junk after "yes" or "no" responses to hostkey
671 prompts.
672 - sftp(1): Have sftp print a warning about shell cleanliness when
673 decoding the first packet fails, which is usually caused by shells
674 polluting stdout of non-interactive startups.
675 - ssh(1)/sshd(8): Switch timers in packet code from using wall-clock
676 time to monotonic time, allowing the packet layer to better function
677 over a clock step and avoiding possible integer overflows during
678 steps.
679 - sshd(8): Correctly detect MIPS ABI in use at configure time. Fixes
680 sandbox violations on some environments.
681 - Build and link with "retpoline" flags when available to mitigate the
682 "branch target injection" style (variant 2) of the Spectre
683 branch-prediction vulnerability.
684
685 -- Colin Watson <cjwatson@debian.org> Tue, 03 Apr 2018 12:40:24 +0100
686
687openssh (1:7.6p1-5) unstable; urgency=medium
688
689 * Explicitly build-depend on pkg-config, rather than implicitly
690 build-depending on it via libgtk-3-dev (thanks, Aurelien Jarno; closes:
691 #894558).
692
693 -- Colin Watson <cjwatson@debian.org> Sun, 01 Apr 2018 21:37:19 +0100
694
695openssh (1:7.6p1-4) unstable; urgency=medium
696
697 * Move VCS to salsa.debian.org.
698 * Add a preseeding-only openssh-server/password-authentication debconf
699 template that can be used to disable password authentication (closes:
700 #878945).
701
702 -- Colin Watson <cjwatson@debian.org> Sat, 10 Feb 2018 02:31:46 +0000
703
704openssh (1:7.6p1-3) unstable; urgency=medium
705
706 [ Colin Watson ]
707 * Remove the decade-old ssh-krb5 transitional package; upgrades of
708 openssh-server will preserve existing configuration, and new
709 installations should just enable GSSAPIAuthentication and
710 GSSAPIKeyExchange in sshd_config (closes: #878626).
711 * Support the "noudeb" build profile.
712 * Fix putty-transfer regression test.
713
714 [ Anders Kaseorg ]
715 * debian/systemd/ssh-agent.service: Add missing dbus dependency.
716
717 [ Jason Duerstock ]
718 * Add a "pkg.openssh.nognome" build profile, which disables building the
719 ssh-askpass-gnome binary package and avoids the build-dependency on
720 libgtk-3-dev (closes: #883819).
721
722 -- Colin Watson <cjwatson@debian.org> Tue, 16 Jan 2018 17:41:08 +0000
723
724openssh (1:7.6p1-2) unstable; urgency=medium
725
726 * Apply upstream patch to fix PermitOpen argument handling.
727
728 -- Colin Watson <cjwatson@debian.org> Sat, 07 Oct 2017 13:44:13 +0100
729
730openssh (1:7.6p1-1) unstable; urgency=medium
731
732 * New upstream release (https://www.openssh.com/txt/release-7.6):
733 - CVE-2017-15906: sftp-server(8): In read-only mode, sftp-server was
734 incorrectly permitting creation of zero-length files. Reported by
735 Michal Zalewski.
736 - ssh(1): Delete SSH protocol version 1 support, associated
737 configuration options and documentation (LP: #1584321).
738 - ssh(1)/sshd(8): Remove support for the hmac-ripemd160 MAC.
739 - ssh(1)/sshd(8): Remove support for the arcfour, blowfish and CAST
740 ciphers.
741 - Refuse RSA keys <1024 bits in length and improve reporting for keys
742 that do not meet this requirement.
743 - ssh(1): Do not offer CBC ciphers by default.
744 - ssh(1): Add RemoteCommand option to specify a command in the ssh
745 config file instead of giving it on the client's command line. This
746 allows the configuration file to specify the command that will be
747 executed on the remote host.
748 - sshd(8): Add ExposeAuthInfo option that enables writing details of the
749 authentication methods used (including public keys where applicable)
750 to a file that is exposed via a $SSH_USER_AUTH environment variable in
751 the subsequent session.
752 - ssh(1): Add support for reverse dynamic forwarding. In this mode, ssh
753 will act as a SOCKS4/5 proxy and forward connections to destinations
754 requested by the remote SOCKS client. This mode is requested using
755 extended syntax for the -R and RemoteForward options and, because it
756 is implemented solely at the client, does not require the server be
757 updated to be supported.
758 - sshd(8): Allow LogLevel directive in sshd_config Match blocks.
759 - ssh-keygen(1): Allow inclusion of arbitrary string or flag certificate
760 extensions and critical options.
761 - ssh-keygen(1): Allow ssh-keygen to use a key held in ssh-agent as a CA
762 when signing certificates.
763 - ssh(1)/sshd(8): Allow IPQoS=none in ssh/sshd to not set an explicit
764 ToS/DSCP value and just use the operating system default.
765 - ssh-add(1): Add -q option to make ssh-add quiet on success.
766 - ssh(1): Expand the StrictHostKeyChecking option with two new settings.
767 The first "accept-new" will automatically accept hitherto-unseen keys
768 but will refuse connections for changed or invalid hostkeys. This is
769 a safer subset of the current behaviour of StrictHostKeyChecking=no.
770 The second setting "off", is a synonym for the current behaviour of
771 StrictHostKeyChecking=no: accept new host keys, and continue
772 connection for hosts with incorrect hostkeys. A future release will
773 change the meaning of StrictHostKeyChecking=no to the behaviour of
774 "accept-new".
775 - ssh(1): Add SyslogFacility option to ssh(1) matching the equivalent
776 option in sshd(8).
777 - ssh(1): Use HostKeyAlias if specified instead of hostname for matching
778 host certificate principal names.
779 - sftp(1): Implement sorting for globbed ls.
780 - ssh(1): Add a user@host prefix to client's "Permission denied"
781 messages, useful in particular when using "stacked" connections (e.g.
782 ssh -J) where it's not clear which host is denying.
783 - ssh(1): Accept unknown EXT_INFO extension values that contain \0
784 characters. These are legal, but would previously cause fatal
785 connection errors if received.
786 - sftp(1): Print '?' instead of incorrect link count (that the protocol
787 doesn't provide) for remote listings.
788 - ssh(1): Return failure rather than fatal() for more cases during
789 session multiplexing negotiations. Causes the session to fall back to
790 a non-mux connection if they occur.
791 - ssh(1): Mention that the server may send debug messages to explain
792 public key authentication problems under some circumstances.
793 - Translate OpenSSL error codes to better report incorrect passphrase
794 errors when loading private keys.
795 - sshd(8): Adjust compatibility patterns for WinSCP to correctly
796 identify versions that implement only the legacy DH group exchange
797 scheme (closes: #877800).
798 - ssh(1): Print the "Killed by signal 1" message only at LogLevel
799 verbose so that it is not shown at the default level; prevents it from
800 appearing during ssh -J and equivalent ProxyCommand configs.
801 - ssh-keygen(1): When generating all hostkeys (ssh-keygen -A), clobber
802 existing keys if they exist but are zero length. Zero-length keys
803 could previously be made if ssh-keygen failed or was interrupted part
804 way through generating them.
805 - ssh-keyscan(1): Avoid double-close() on file descriptors.
806 - sshd(8): Avoid reliance on shared use of pointers shared between
807 monitor and child sshd processes.
808 - sshd_config(8): Document available AuthenticationMethods.
809 - ssh(1): Avoid truncation in some login prompts.
810 - ssh(1): Make "--" before the hostname terminate argument processing
811 after the hostname too (closes: #873201).
812 - ssh-keygen(1): Switch from aes256-cbc to aes256-ctr for encrypting
813 new-style private keys.
814 - ssh(1): Warn and do not attempt to use keys when the public and
815 private halves do not match.
816 - sftp(1): Don't print verbose error message when ssh disconnects from
817 under sftp.
818 - sshd(8): Fix keepalive scheduling problem: prevent activity on a
819 forwarded port from preventing the keepalive from being sent.
820 - sshd(8): When started without root privileges, don't require the
821 privilege separation user or path to exist.
822 - ssh(1)/sshd(8): Correctness fix for channels implementation: accept
823 channel IDs greater than 0x7FFFFFFF.
824 - sshd(8): Expose list of completed authentication methods to PAM via
825 the SSH_AUTH_INFO_0 PAM environment variable.
826 - ssh(1)/sshd(8): Fix several problems in the tun/tap forwarding code,
827 mostly to do with host/network byte order confusion.
828 - sshd(8): Avoid Linux seccomp violations on ppc64le over the socketcall
829 syscall.
830 * Build-depend on debhelper (>= 9.20160709~) rather than dh-systemd.
831 * Change priorities of ssh and ssh-krb5 binary packages to optional, since
832 "Priority: extra" is now deprecated.
833 * Use HTTPS form of copyright-format URL.
834 * Adjust "Running sshd from inittab" instructions in README.Debian to
835 recommend using service(8) rather than calling the init script directly.
836 * Policy version 4.1.0.
837 * Adjust "Per-connection sshd instances with systemd" instructions in
838 README.Debian to recommend using a drop-in file rather than copying and
839 modifying the ssh.socket unit file.
840
841 -- Colin Watson <cjwatson@debian.org> Fri, 06 Oct 2017 12:36:48 +0100
842
843openssh (1:7.5p1-10) unstable; urgency=medium
844
845 * Tell haveged to create the pid file we expect.
846 * Give up and use systemctl to start haveged if running under systemd;
847 this shouldn't be necessary, but I can't seem to get things working in
848 the Ubuntu autopkgtest environment otherwise.
849
850 -- Colin Watson <cjwatson@debian.org> Fri, 01 Sep 2017 11:17:19 +0100
851
852openssh (1:7.5p1-9) unstable; urgency=medium
853
854 * Run debian/tests/regress with "set -x".
855 * Run haveged without "-w 1024", as setting the low water mark doesn't
856 seem possible in all autopkgtest virtualisation environments.
857
858 -- Colin Watson <cjwatson@debian.org> Thu, 31 Aug 2017 13:23:04 +0100
859
860openssh (1:7.5p1-8) unstable; urgency=medium
861
862 * Drop openssh-client-ssh1, now built by a separate source package.
863 * Run haveged during autopkgtests to ensure that they have enough entropy
864 for key generation (LP: #1712921).
865 * Apply patches from https://bugzilla.mindrot.org/show_bug.cgi?id=2752 to
866 allow some extra syscalls for crypto cards on s390x (LP: #1686618).
867
868 -- Colin Watson <cjwatson@debian.org> Mon, 28 Aug 2017 12:16:35 +0100
869
870openssh (1:7.5p1-7) unstable; urgency=medium
871
872 * Fix spelling of RuntimeDirectoryMode (closes: #872976).
873 * Add RuntimeDirectory and RuntimeDirectoryMode to ssh@.service as well as
874 ssh.service (closes: #872978).
875
876 -- Colin Watson <cjwatson@debian.org> Wed, 23 Aug 2017 12:12:59 +0100
877
878openssh (1:7.5p1-6) unstable; urgency=medium
879
880 [ Colin Watson ]
881 * Test configuration before starting or reloading sshd under systemd
882 (closes: #865770).
883 * Create /run/sshd under systemd using RuntimeDirectory rather than
884 tmpfiles.d (thanks, Dmitry Smirnov; closes: #864190).
885
886 [ Dimitri John Ledkov ]
887 * Drop upstart system and user jobs (closes: #872851).
888
889 [ Chris Lamb ]
890 * Quote IP address in suggested "ssh-keygen -f" calls (closes: #872643).
891
892 -- Colin Watson <cjwatson@debian.org> Wed, 23 Aug 2017 01:41:06 +0100
893
894openssh (1:7.5p1-5) unstable; urgency=medium
895
896 * Upload to unstable.
897 * Fix syntax error in debian/copyright.
898
899 -- Colin Watson <cjwatson@debian.org> Sun, 18 Jun 2017 12:08:42 +0100
900
901openssh (1:7.5p1-4) experimental; urgency=medium
902
903 * Drop README.Debian section on privilege separation, as it's no longer
904 optional.
905 * Only call "initctl set-env" from agent-launch if $UPSTART_SESSION is set
906 (LP: #1689299).
907 * Fix incoming compression statistics (thanks, Russell Coker; closes:
908 #797964).
909 * Relicense debian/* under a two-clause BSD licence for bidirectional
910 compatibility with upstream, with permission from Matthew Vernon and
911 others.
912
913 -- Colin Watson <cjwatson@debian.org> Tue, 06 Jun 2017 15:17:58 +0100
914
915openssh (1:7.5p1-3) experimental; urgency=medium
916
917 * Fix debian/adjust-openssl-dependencies to account for preferring
918 libssl1.0-dev.
919 * Adjust OpenSSL dependencies for openssh-client-ssh1 too.
920 * Fix purge failure when /etc/ssh has already somehow been removed
921 (LP: #1682817).
922 * Ensure that /etc/ssh exists before trying to create /etc/ssh/sshd_config
923 (LP: #1685022).
924
925 -- Colin Watson <cjwatson@debian.org> Tue, 02 May 2017 13:51:27 +0100
926
927openssh (1:7.5p1-2) experimental; urgency=medium
928
929 * Add missing header on Linux/s390.
930 * Fix syntax error on Linux/X32.
931
932 -- Colin Watson <cjwatson@debian.org> Sun, 02 Apr 2017 13:20:11 +0100
933
934openssh (1:7.5p1-1) experimental; urgency=medium
935
936 * New upstream release (https://www.openssh.com/txt/release-7.5):
937 - SECURITY: ssh(1), sshd(8): Fix weakness in CBC padding oracle
938 countermeasures that allowed a variant of the attack fixed in OpenSSH
939 7.3 to proceed. Note that the OpenSSH client disables CBC ciphers by
940 default, sshd offers them as lowest-preference options and will remove
941 them by default entirely in the next release.
942 - This release deprecates the sshd_config UsePrivilegeSeparation option,
943 thereby making privilege separation mandatory (closes: #407754).
944 - The format of several log messages emitted by the packet code has
945 changed to include additional information about the user and their
946 authentication state. Software that monitors ssh/sshd logs may need
947 to account for these changes.
948 - ssh(1), sshd(8): Support "=-" syntax to easily remove methods from
949 algorithm lists, e.g. Ciphers=-*cbc.
950 - sshd(1): Fix NULL dereference crash when key exchange start messages
951 are sent out of sequence.
952 - ssh(1), sshd(8): Allow form-feed characters to appear in configuration
953 files.
954 - sshd(8): Fix regression in OpenSSH 7.4 support for the server-sig-algs
955 extension, where SHA2 RSA signature methods were not being correctly
956 advertised.
957 - ssh(1), ssh-keygen(1): Fix a number of case-sensitivity bugs in
958 known_hosts processing.
959 - ssh(1): Allow ssh to use certificates accompanied by a private key
960 file but no corresponding plain *.pub public key.
961 - ssh(1): When updating hostkeys using the UpdateHostKeys option, accept
962 RSA keys if HostkeyAlgorithms contains any RSA keytype. Previously,
963 ssh could ignore RSA keys when only the ssh-rsa-sha2-* methods were
964 enabled in HostkeyAlgorithms and not the old ssh-rsa method.
965 - ssh(1): Detect and report excessively long configuration file lines.
966 - Merge a number of fixes found by Coverity and reported via Redhat and
967 FreeBSD. Includes fixes for some memory and file descriptor leaks in
968 error paths.
969 - ssh(1), sshd(8): When logging long messages to stderr, don't truncate
970 "\r\n" if the length of the message exceeds the buffer.
971 - ssh(1): Fully quote [host]:port in generated ProxyJump/-J command-
972 line; avoid confusion over IPv6 addresses and shells that treat square
973 bracket characters specially.
974 - Fix various fallout and sharp edges caused by removing SSH protocol 1
975 support from the server, including the server banner string being
976 incorrectly terminated with only \n (instead of \r\n), confusing error
977 messages from ssh-keyscan, and a segfault in sshd if protocol v.1 was
978 enabled for the client and sshd_config contained references to legacy
979 keys.
980 - ssh(1), sshd(8): Free fd_set on connection timeout.
981 - sftp(1): Fix division by zero crash in "df" output when server returns
982 zero total filesystem blocks/inodes.
983 - ssh(1), ssh-add(1), ssh-keygen(1), sshd(8): Translate OpenSSL errors
984 encountered during key loading to more meaningful error codes.
985 - ssh-keygen(1): Sanitise escape sequences in key comments sent to
986 printf but preserve valid UTF-8 when the locale supports it.
987 - ssh(1), sshd(8): Return reason for port forwarding failures where
988 feasible rather than always "administratively prohibited".
989 - sshd(8): Fix deadlock when AuthorizedKeysCommand or
990 AuthorizedPrincipalsCommand produces a lot of output and a key is
991 matched early.
992 - ssh(1): Fix typo in ~C error message for bad port forward
993 cancellation.
994 - ssh(1): Show a useful error message when included config files can't
995 be opened.
996 - sshd_config(5): Repair accidentally-deleted mention of %k token in
997 AuthorizedKeysCommand.
998 - sshd(8): Remove vestiges of previously removed LOGIN_PROGRAM.
999 - ssh-agent(1): Relax PKCS#11 whitelist to include libexec and common
1000 32-bit compatibility library directories.
1001 - sftp-client(1): Fix non-exploitable integer overflow in SSH2_FXP_NAME
1002 response handling.
1003 - ssh-agent(1): Fix regression in 7.4 of deleting PKCS#11-hosted keys.
1004 It was not possible to delete them except by specifying their full
1005 physical path.
1006 - sshd(8): Avoid sandbox errors for Linux S390 systems using an ICA
1007 crypto coprocessor.
1008 - sshd(8): Fix non-exploitable weakness in seccomp-bpf sandbox arg
1009 inspection.
1010 - ssh-keygen(1), ssh(1), sftp(1): Fix output truncation for various that
1011 contain non-printable characters where the codeset in use is ASCII.
1012
1013 -- Colin Watson <cjwatson@debian.org> Sun, 02 Apr 2017 02:58:01 +0100
1014
1015openssh (1:7.4p1-11) unstable; urgency=medium
1016
1017 * Fix incoming compression statistics (thanks, Russell Coker; closes:
1018 #797964).
1019
1020 -- Colin Watson <cjwatson@debian.org> Tue, 06 Jun 2017 15:03:48 +0100
1021
1022openssh (1:7.4p1-10) unstable; urgency=medium
1023
1024 * Move privilege separation directory and PID file from /var/run/ to /run/
1025 (closes: #760422, #856825).
1026 * Unbreak Unix domain socket forwarding for root (closes: #858252).
1027
1028 -- Colin Watson <cjwatson@debian.org> Thu, 30 Mar 2017 11:19:04 +0100
1029
1030openssh (1:7.4p1-9) unstable; urgency=medium
1031
1032 * Fix null pointer dereference in ssh-keygen; this fixes an autopkgtest
1033 regression introduced in 1:7.4p1-8.
1034
1035 -- Colin Watson <cjwatson@debian.org> Thu, 16 Mar 2017 13:43:15 +0000
1036
1037openssh (1:7.4p1-8) unstable; urgency=medium
1038
1039 * Fix ssh-keygen -H accidentally corrupting known_hosts that contained
1040 already-hashed entries (closes: #851734, LP: #1668093).
1041 * Fix ssh-keyscan to correctly hash hosts with a port number (closes:
1042 #857736, LP: #1670745).
1043
1044 -- Colin Watson <cjwatson@debian.org> Tue, 14 Mar 2017 13:49:14 +0000
1045
1046openssh (1:7.4p1-7) unstable; urgency=medium
1047
1048 * Don't set "PermitRootLogin yes" on fresh installations (regression
1049 introduced in 1:7.4p1-1; closes: #852781).
1050 * Restore reading authorized_keys2 by default. Upstream seems to intend
1051 to gradually phase this out, so don't assume that this will remain the
1052 default forever. However, we were late in adopting the upstream
1053 sshd_config changes, so it makes sense to extend the grace period
1054 (closes: #852320).
1055
1056 -- Colin Watson <cjwatson@debian.org> Sun, 05 Mar 2017 02:12:42 +0000
1057
1058openssh (1:7.4p1-6) unstable; urgency=medium
1059
1060 * Remove temporary file on exit from postinst (closes: #850275).
1061 * Remove LOGIN_PROGRAM and LOGIN_NO_ENDOPT definitions, since UseLogin is
1062 gone.
1063 * Document sshd_config changes that may be needed following the removal of
1064 protocol 1 support from sshd (closes: #851573).
1065 * Remove ssh_host_dsa_key from HostKey default (closes: #850614).
1066 * Fix rekeying failure with GSSAPI key exchange (thanks, Harald Barth;
1067 closes: #819361, LP: #1608965).
1068
1069 -- Colin Watson <cjwatson@debian.org> Mon, 16 Jan 2017 15:11:10 +0000
1070
1071openssh (1:7.4p1-5) unstable; urgency=medium
1072
1073 * Create mux socket for regression tests in a temporary directory.
1074 * Work around clock_gettime kernel bug on Linux x32 (closes: #849923).
1075
1076 -- Colin Watson <cjwatson@debian.org> Tue, 03 Jan 2017 14:43:28 +0000
1077
1078openssh (1:7.4p1-4) unstable; urgency=medium
1079
1080 * Run regression tests inside annotate-output to try to diagnose timeout
1081 issues.
1082 * Make integrity tests more robust against timeouts in the case where the
1083 first test in a series for a given MAC happens to modify the low bytes
1084 of a packet length.
1085 * Fix race conditions in forwarding tests.
1086
1087 -- Colin Watson <cjwatson@debian.org> Mon, 02 Jan 2017 19:37:23 +0000
1088
1089openssh (1:7.4p1-3) unstable; urgency=medium
1090
1091 * Revert attempted hack around regress/forwarding.sh test failure, since
1092 it doesn't seem to help.
1093 * Run regression tests using 'sh -x' to try to get more information about
1094 failures.
1095 * Dump some useful log files if regression tests fail.
1096 * Tweak regression test setup to cope with the case where some of the
1097 source directory is unreadable by the openssh-tests user.
1098
1099 -- Colin Watson <cjwatson@debian.org> Sat, 31 Dec 2016 02:48:17 +0000
1100
1101openssh (1:7.4p1-2) unstable; urgency=medium
1102
1103 * Attempt to hack around regress/forwarding.sh test failure in some
1104 environments.
1105 * Avoid calling into Kerberos libraries from ssh_gssapi_server_mechanisms
1106 in the privsep monitor.
1107
1108 -- Colin Watson <cjwatson@debian.org> Thu, 29 Dec 2016 12:02:12 +0000
1109
1110openssh (1:7.4p1-1) unstable; urgency=medium
1111
1112 * New upstream release (http://www.openssh.com/txt/release-7.4):
1113 - ssh(1): Remove 3des-cbc from the client's default proposal. 64-bit
1114 block ciphers are not safe in 2016 and we don't want to wait until
1115 attacks like SWEET32 are extended to SSH. As 3des-cbc was the only
1116 mandatory cipher in the SSH RFCs, this may cause problems connecting
1117 to older devices using the default configuration, but it's highly
1118 likely that such devices already need explicit configuration for key
1119 exchange and hostkey algorithms already anyway.
1120 - sshd(8): When a forced-command appears in both a certificate and an
1121 authorized keys/principals command= restriction, sshd will now refuse
1122 to accept the certificate unless they are identical. The previous
1123 (documented) behaviour of having the certificate forced-command
1124 override the other could be a bit confusing and error-prone.
1125 - sshd(8): Remove the UseLogin configuration directive and support for
1126 having /bin/login manage login sessions.
1127 - CVE-2016-10009: ssh-agent(1): Will now refuse to load PKCS#11 modules
1128 from paths outside a trusted whitelist (run-time configurable).
1129 Requests to load modules could be passed via agent forwarding and an
1130 attacker could attempt to load a hostile PKCS#11 module across the
1131 forwarded agent channel: PKCS#11 modules are shared libraries, so this
1132 would result in code execution on the system running the ssh-agent if
1133 the attacker has control of the forwarded agent-socket (on the host
1134 running the sshd server) and the ability to write to the filesystem of
1135 the host running ssh-agent (usually the host running the ssh client)
1136 (closes: #848714).
1137 - CVE-2016-10010: sshd(8): When privilege separation is disabled,
1138 forwarded Unix-domain sockets would be created by sshd(8) with the
1139 privileges of 'root' instead of the authenticated user. This release
1140 refuses Unix-domain socket forwarding when privilege separation is
1141 disabled (Privilege separation has been enabled by default for 14
1142 years) (closes: #848715).
1143 - CVE-2016-10011: sshd(8): Avoid theoretical leak of host private key
1144 material to privilege-separated child processes via realloc() when
1145 reading keys. No such leak was observed in practice for normal-sized
1146 keys, nor does a leak to the child processes directly expose key
1147 material to unprivileged users (closes: #848716).
1148 - CVE-2016-10012: sshd(8): The shared memory manager used by
1149 pre-authentication compression support had a bounds checks that could
1150 be elided by some optimising compilers. Additionally, this memory
1151 manager was incorrectly accessible when pre-authentication compression
1152 was disabled. This could potentially allow attacks against the
1153 privileged monitor process from the sandboxed privilege-separation
1154 process (a compromise of the latter would be required first). This
1155 release removes support for pre-authentication compression from
1156 sshd(8) (closes: #848717).
1157 - SECURITY: sshd(8): Validate address ranges for AllowUser and DenyUsers
1158 directives at configuration load time and refuse to accept invalid
1159 ones. It was previously possible to specify invalid CIDR address
1160 ranges (e.g. user@127.1.2.3/55) and these would always match, possibly
1161 resulting in granting access where it was not intended.
1162 - ssh(1): Add a proxy multiplexing mode to ssh(1) inspired by the
1163 version in PuTTY by Simon Tatham. This allows a multiplexing client
1164 to communicate with the master process using a subset of the SSH
1165 packet and channels protocol over a Unix-domain socket, with the main
1166 process acting as a proxy that translates channel IDs, etc. This
1167 allows multiplexing mode to run on systems that lack file-descriptor
1168 passing (used by current multiplexing code) and potentially, in
1169 conjunction with Unix-domain socket forwarding, with the client and
1170 multiplexing master process on different machines. Multiplexing proxy
1171 mode may be invoked using "ssh -O proxy ...".
1172 - sshd(8): Add a sshd_config DisableForwarding option that disables X11,
1173 agent, TCP, tunnel and Unix domain socket forwarding, as well as
1174 anything else we might implement in the future. Like the 'restrict'
1175 authorized_keys flag, this is intended to be a simple and future-proof
1176 way of restricting an account.
1177 - sshd(8), ssh(1): Support the "curve25519-sha256" key exchange method.
1178 This is identical to the currently-supported method named
1179 "curve25519-sha256@libssh.org".
1180 - sshd(8): Improve handling of SIGHUP by checking to see if sshd is
1181 already daemonised at startup and skipping the call to daemon(3) if it
1182 is. This ensures that a SIGHUP restart of sshd(8) will retain the
1183 same process-ID as the initial execution. sshd(8) will also now
1184 unlink the PidFile prior to SIGHUP restart and re-create it after a
1185 successful restart, rather than leaving a stale file in the case of a
1186 configuration error.
1187 - sshd(8): Allow ClientAliveInterval and ClientAliveCountMax directives
1188 to appear in sshd_config Match blocks.
1189 - sshd(8): Add %-escapes to AuthorizedPrincipalsCommand to match those
1190 supported by AuthorizedKeysCommand (key, key type, fingerprint, etc.)
1191 and a few more to provide access to the contents of the certificate
1192 being offered.
1193 - ssh(1): Allow IdentityFile to successfully load and use certificates
1194 that have no corresponding bare public key.
1195 - ssh(1): Fix public key authentication when multiple authentication is
1196 in use and publickey is not just the first method attempted.
1197 - ssh(1): Improve reporting when attempting to load keys from PKCS#11
1198 tokens with fewer useless log messages and more detail in debug
1199 messages.
1200 - ssh(1): When tearing down ControlMaster connections, don't pollute
1201 stderr when LogLevel=quiet.
1202 - sftp(1): On ^Z wait for underlying ssh(1) to suspend before suspending
1203 sftp(1) to ensure that ssh(1) restores the terminal mode correctly if
1204 suspended during a password prompt.
1205 - ssh(1): Avoid busy-wait when ssh(1) is suspended during a password
1206 prompt (LP: #1646813).
1207 - ssh(1), sshd(8): Correctly report errors during sending of ext-info
1208 messages.
1209 - sshd(8): Fix NULL-deref crash if sshd(8) received an out-of-sequence
1210 NEWKEYS message.
1211 - sshd(8): Correct list of supported signature algorithms sent in the
1212 server-sig-algs extension.
1213 - sshd(8): Fix sending ext_info message if privsep is disabled.
1214 - sshd(8): More strictly enforce the expected ordering of privilege
1215 separation monitor calls used for authentication and allow them only
1216 when their respective authentication methods are enabled in the
1217 configuration.
1218 - sshd_config(5): Use 2001:db8::/32, the official IPv6 subnet for
1219 configuration examples.
1220 - On environments configured with Turkish locales, fall back to the
1221 C/POSIX locale to avoid errors in configuration parsing caused by that
1222 locale's unique handling of the letters 'i' and 'I' (LP: #1638338).
1223 - contrib: Add a gnome-ssh-askpass3 with GTK+3 support.
1224 - sshd(8): Improve PRNG reseeding across privilege separation and force
1225 libcrypto to obtain a high-quality seed before chroot or sandboxing.
1226 * Apply "wrap-and-sort -at -f debian/control -f debian/tests/control".
1227 * Remove entries related to protocol 1 from the default sshd_config
1228 generated on new installations.
1229 * Remove some advice related to protocol 1 from README.Debian.
1230 * Start handling /etc/ssh/sshd_config using ucf. The immediate motivation
1231 for this is to deal with deprecations of options related to protocol 1,
1232 but something like this has been needed for a long time (closes:
1233 #419574, #848089):
1234 - sshd_config is now a slightly-patched version of upstream's, and only
1235 contains non-default settings (closes: #147201).
1236 - I've included as many historical md5sums of default versions of
1237 sshd_config as I could reconstruct from version control, but I'm sure
1238 I've missed some.
1239 - Explicitly synchronise the debconf database with the current
1240 configuration file state in openssh-server.config, to ensure that the
1241 PermitRootLogin setting is properly preserved.
1242 - UsePrivilegeSeparation now defaults to the stronger "sandbox" rather
1243 than "yes", per upstream.
1244 * Remove redundant "GSSAPIDelegateCredentials no" from ssh_config (already
1245 the upstream default), and document that setting ServerAliveInterval to
1246 300 by default if BatchMode is set is Debian-specific (closes: #765630).
1247 * Build gnome-ssh-askpass with GTK+ 3 (LP: #801187).
1248 * When running regression tests under autopkgtest, use a non-root user
1249 with passwordless sudo.
1250
1251 -- Colin Watson <cjwatson@debian.org> Tue, 27 Dec 2016 18:01:46 +0000
1252
1253openssh (1:7.3p1-5) unstable; urgency=medium
1254
1255 * debian/tests/control: Add dependency on openssl, required by the PuTTY
1256 interoperability tests.
1257
1258 -- Colin Watson <cjwatson@debian.org> Sat, 03 Dec 2016 03:43:21 +0000
1259
1260openssh (1:7.3p1-4) unstable; urgency=medium
1261
1262 * Adjust Build-Depends further to avoid considering libssl-dev >= 1.1.0~
1263 as sufficient.
1264 * Move build directories under debian/.
1265 * Remove the non-upstream .gitignore file and add the relevant entries to
1266 debian/.gitignore, in order to make the source tree more
1267 dgit-compatible.
1268 * Build all upstream regression test binaries using the new
1269 "regress-binaries" target.
1270 * Fix and enable PuTTY interoperability tests under autopkgtest.
1271
1272 -- Colin Watson <cjwatson@debian.org> Fri, 02 Dec 2016 20:49:30 +0000
1273
1274openssh (1:7.3p1-3) unstable; urgency=medium
1275
1276 * Avoid building with OpenSSL 1.1 for now (see #828475).
1277 * Add a missing License line to debian/copyright.
1278 * Policy version 3.9.8: no changes required.
1279
1280 -- Colin Watson <cjwatson@debian.org> Sat, 05 Nov 2016 15:37:15 +0000
1281
1282openssh (1:7.3p1-2) unstable; urgency=high
1283
1284 * Rewrite debian/copyright using copyright-format 1.0.
1285 * CVE-2016-8858: Unregister the KEXINIT handler after message has been
1286 received (closes: #841884).
1287
1288 -- Colin Watson <cjwatson@debian.org> Mon, 24 Oct 2016 11:18:00 +0100
1289
1290openssh (1:7.3p1-1) unstable; urgency=medium
1291
1292 * New upstream release (http://www.openssh.com/txt/release-7.3):
1293 - SECURITY: sshd(8): Mitigate a potential denial-of-service attack
1294 against the system's crypt(3) function via sshd(8). An attacker could
1295 send very long passwords that would cause excessive CPU use in
1296 crypt(3). sshd(8) now refuses to accept password authentication
1297 requests of length greater than 1024 characters.
1298 - SECURITY: ssh(1), sshd(8): Fix observable timing weakness in the CBC
1299 padding oracle countermeasures. Note that CBC ciphers are disabled by
1300 default and only included for legacy compatibility.
1301 - SECURITY: ssh(1), sshd(8): Improve operation ordering of MAC
1302 verification for Encrypt-then-MAC (EtM) mode transport MAC algorithms
1303 to verify the MAC before decrypting any ciphertext. This removes the
1304 possibility of timing differences leaking facts about the plaintext,
1305 though no such leakage has been observed.
1306 - ssh(1): Add a ProxyJump option and corresponding -J command-line flag
1307 to allow simplified indirection through a one or more SSH bastions or
1308 "jump hosts".
1309 - ssh(1): Add an IdentityAgent option to allow specifying specific agent
1310 sockets instead of accepting one from the environment.
1311 - ssh(1): Allow ExitOnForwardFailure and ClearAllForwardings to be
1312 optionally overridden when using ssh -W.
1313 - ssh(1), sshd(8): Implement support for the IUTF8 terminal mode as per
1314 draft-sgtatham-secsh-iutf8-00 (closes: #337041, LP: #394570).
1315 - ssh(1), sshd(8): Add support for additional fixed Diffie-Hellman 2K,
1316 4K and 8K groups from draft-ietf-curdle-ssh-kex-sha2-03.
1317 - ssh-keygen(1), ssh(1), sshd(8): Support SHA256 and SHA512 RSA
1318 signatures in certificates.
1319 - ssh(1): Add an Include directive for ssh_config(5) files (closes:
1320 #536031).
1321 - ssh(1): Permit UTF-8 characters in pre-authentication banners sent
1322 from the server.
1323 - ssh(1), sshd(8): Reduce the syslog level of some relatively common
1324 protocol events from LOG_CRIT.
1325 - sshd(8): Refuse AuthenticationMethods="" in configurations and accept
1326 AuthenticationMethods=any for the default behaviour of not requiring
1327 multiple authentication.
1328 - sshd(8): Remove obsolete and misleading "POSSIBLE BREAK-IN ATTEMPT!"
1329 message when forward and reverse DNS don't match.
1330 - ssh(1): Deduplicate LocalForward and RemoteForward entries to fix
1331 failures when both ExitOnForwardFailure and hostname canonicalisation
1332 are enabled.
1333 - sshd(8): Remove fallback from moduli to obsolete "primes" file that
1334 was deprecated in 2001 (LP: #1528251).
1335 - sshd_config(5): Correct description of UseDNS: it affects ssh hostname
1336 processing for authorized_keys, not known_hosts.
1337 - sshd(8): Send ClientAliveInterval pings when a time-based RekeyLimit
1338 is set; previously keepalive packets were not being sent.
1339 - sshd(8): Whitelist more architectures to enable the seccomp-bpf
1340 sandbox.
1341 - scp(1): Respect the local user's LC_CTYPE locale (closes: #396295).
1342 - Take character display widths into account for the progressmeter
1343 (closes: #407088).
1344
1345 -- Colin Watson <cjwatson@debian.org> Sun, 07 Aug 2016 22:45:26 +0100
1346
1347openssh (1:7.2p2-8) unstable; urgency=medium
1348
1349 [ Colin Watson ]
1350 * Stop enabling ssh-session-cleanup.service by default; instead, ship it
1351 as an example and add a section to README.Debian. libpam-systemd >= 230
1352 and "UsePAM yes" should take care of the original problem for most
1353 systemd users (thanks, Michael Biebl; closes: #832155).
1354
1355 [ Martin Pitt ]
1356 * Add debian/agent-launch: Helper script for conditionally starting the SSH
1357 agent in the user session. Use it in ssh-agent.user-session.upstart.
1358 * Add systemd user unit for graphical sessions that use systemd. Override
1359 the corresponding upstart job in that case (closes: #832445).
1360 * debian/openssh-server.if-up: Don't block on a finished reload of
1361 openssh.service, to avoid deadlocking with restarting networking.
1362 (closes: #832557, LP: #1584393)
1363
1364 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2016 02:51:32 +0100
1365
1366openssh (1:7.2p2-7) unstable; urgency=medium
1367
1368 * Don't stop the ssh-session-cleanup service on upgrade (closes: #832155).
1369 This may cause SSH sessions to be killed on upgrade to *this* version if
1370 you had previously installed 1:7.2p2-6. Sorry! If your session is
1371 killed, you can recover using "dpkg --unpack" on this openssh-server
1372 .deb, followed by "dpkg --configure -a".
1373 * Recommend libpam-systemd from openssh-server. It's a much better
1374 solution than the above for systemd users, but I'm wary of depending on
1375 it in case I cause an assortment of exciting dependency problems on
1376 upgrade for non-systemd users.
1377
1378 -- Colin Watson <cjwatson@debian.org> Sat, 23 Jul 2016 11:46:33 +0100
1379
1380openssh (1:7.2p2-6) unstable; urgency=medium
1381
1382 * debian/watch: Switch to HTTP (thanks, Nicholas Luedtke; closes:
1383 #822997).
1384 * Copy summary of supported SFTP protocol versions from upstream's
1385 PROTOCOL file into the openssh-sftp-server package description (closes:
1386 #766887).
1387 * Set SSH_PROGRAM=/usr/bin/ssh1 when building openssh-client-ssh1 so that
1388 scp1 works (reported by Olivier MATZ).
1389 * Retroactively add a NEWS.Debian entry for the UseDNS change in 6.9 (see
1390 LP #1588457).
1391 * CVE-2016-6210: Mitigate user enumeration via covert timing channel
1392 (closes: #831902).
1393 * Backport upstream patch to close ControlPersist background process
1394 stderr when not in debug mode or when logging to a file or syslog
1395 (closes: #714526).
1396 * Add a session cleanup script and a systemd unit file to trigger it,
1397 which serves to terminate SSH sessions cleanly if systemd doesn't do
1398 that itself, often because libpam-systemd is not installed (thanks,
1399 Vivek Das Mohapatra, Tom Hutter, and others; closes: #751636).
1400 * Stop generating DSA host keys by default (thanks, Santiago Vila; closes:
1401 #823827).
1402
1403 -- Colin Watson <cjwatson@debian.org> Fri, 22 Jul 2016 17:06:19 +0100
1404
1405openssh (1:7.2p2-5) unstable; urgency=medium
1406
1407 * Backport upstream patch to unbreak authentication using lone certificate
1408 keys in ssh-agent: when attempting pubkey auth with a certificate, if no
1409 separate private key is found among the keys then try with the
1410 certificate key itself (thanks, Paul Querna; LP: #1575961).
1411
1412 -- Colin Watson <cjwatson@debian.org> Thu, 28 Apr 2016 01:52:01 +0100
1413
1414openssh (1:7.2p2-4) unstable; urgency=medium
1415
1416 * Drop dependency on libnss-files-udeb (closes: #819686).
1417 * Policy version 3.9.7: no changes required.
1418
1419 -- Colin Watson <cjwatson@debian.org> Fri, 15 Apr 2016 16:40:07 +0100
1420
1421openssh (1:7.2p2-3) unstable; urgency=high
1422
1423 * Change all openssh.org references to openssh.com (closes: #819213).
1424 * CVE-2015-8325: Ignore PAM environment vars when UseLogin=yes.
1425
1426 -- Colin Watson <cjwatson@debian.org> Wed, 13 Apr 2016 16:42:28 +0100
1427
1428openssh (1:7.2p2-2) unstable; urgency=medium
1429
1430 * Fix kexgss_server to cope with DH_GRP_MIN/DH_GRP_MAX being stricter on
1431 the server end than the client (thanks, Damien Miller; closes: #817870,
1432 LP: #1558576).
1433
1434 -- Colin Watson <cjwatson@debian.org> Mon, 21 Mar 2016 12:08:55 +0000
1435
1436openssh (1:7.2p2-1) unstable; urgency=high
1437
1438 * New upstream release (http://www.openssh.com/txt/release-7.2p2):
1439 - CVE-2016-3115: sshd(8): Sanitise X11 authentication credentials to
1440 avoid xauth command injection when X11Forwarding is enabled
1441 (http://www.openssh.com/txt/x11fwd.adv).
1442
1443 -- Colin Watson <cjwatson@debian.org> Thu, 10 Mar 2016 13:04:29 +0000
1444
1445openssh (1:7.2p1-1) unstable; urgency=medium
1446
1447 * New upstream release (http://www.openssh.com/txt/release-7.2):
1448 - This release disables a number of legacy cryptographic algorithms by
1449 default in ssh:
1450 + Several ciphers blowfish-cbc, cast128-cbc, all arcfour variants and
1451 the rijndael-cbc aliases for AES.
1452 + MD5-based and truncated HMAC algorithms.
1453 These algorithms are already disabled by default in sshd.
1454 - ssh(1), sshd(8): Remove unfinished and unused roaming code (was
1455 already forcibly disabled in OpenSSH 7.1p2).
1456 - ssh(1): Eliminate fallback from untrusted X11 forwarding to trusted
1457 forwarding when the X server disables the SECURITY extension.
1458 - ssh(1), sshd(8): Increase the minimum modulus size supported for
1459 diffie-hellman-group-exchange to 2048 bits.
1460 - sshd(8): Pre-auth sandboxing is now enabled by default (previous
1461 releases enabled it for new installations via sshd_config).
1462 - all: Add support for RSA signatures using SHA-256/512 hash algorithms
1463 based on draft-rsa-dsa-sha2-256-03.txt and draft-ssh-ext-info-04.txt.
1464 - ssh(1): Add an AddKeysToAgent client option which can be set to 'yes',
1465 'no', 'ask', or 'confirm', and defaults to 'no'. When enabled, a
1466 private key that is used during authentication will be added to
1467 ssh-agent if it is running (with confirmation enabled if set to
1468 'confirm').
1469 - sshd(8): Add a new authorized_keys option "restrict" that includes all
1470 current and future key restrictions (no-*-forwarding, etc.). Also add
1471 permissive versions of the existing restrictions, e.g. "no-pty" ->
1472 "pty". This simplifies the task of setting up restricted keys and
1473 ensures they are maximally-restricted, regardless of any permissions
1474 we might implement in the future.
1475 - ssh(1): Add ssh_config CertificateFile option to explicitly list
1476 certificates.
1477 - ssh-keygen(1): Allow ssh-keygen to change the key comment for all
1478 supported formats (closes: #811125).
1479 - ssh-keygen(1): Allow fingerprinting from standard input, e.g.
1480 "ssh-keygen -lf -" (closes: #509058).
1481 - ssh-keygen(1): Allow fingerprinting multiple public keys in a file,
1482 e.g. "ssh-keygen -lf ~/.ssh/authorized_keys".
1483 - sshd(8): Support "none" as an argument for sshd_config Foreground and
1484 ChrootDirectory. Useful inside Match blocks to override a global
1485 default.
1486 - ssh-keygen(1): Support multiple certificates (one per line) and
1487 reading from standard input (using "-f -") for "ssh-keygen -L"
1488 - ssh-keyscan(1): Add "ssh-keyscan -c ..." flag to allow fetching
1489 certificates instead of plain keys.
1490 - ssh(1): Better handle anchored FQDNs (e.g. 'cvs.openbsd.org.') in
1491 hostname canonicalisation - treat them as already canonical and remove
1492 the trailing '.' before matching ssh_config.
1493 - sftp(1): Existing destination directories should not terminate
1494 recursive uploads (regression in OpenSSH 6.8; LP: #1553378).
1495 * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb.
1496 * Restore slogin symlinks for compatibility, although they were removed
1497 upstream.
1498
1499 -- Colin Watson <cjwatson@debian.org> Tue, 08 Mar 2016 11:47:20 +0000
1500
1501openssh (1:7.1p2-2) unstable; urgency=medium
1502
1503 * Remove protocol 1 host key generation from openssh-server.postinst
1504 (closes: #811265).
1505
1506 -- Colin Watson <cjwatson@debian.org> Sun, 17 Jan 2016 14:10:19 +0000
1507
1508openssh (1:7.1p2-1) unstable; urgency=high
1509
1510 * New upstream release (http://www.openssh.com/txt/release-7.1p2):
1511 - CVE-2016-0777, CVE-2016-0778: Disable experimental client-side support
1512 for roaming, which could be tricked by a malicious server into leaking
1513 client memory to the server, including private client user keys; this
1514 information leak is restricted to connections to malicious or
1515 compromised servers (closes: #810984).
1516 - SECURITY: Fix an out of-bound read access in the packet handling code.
1517 Reported by Ben Hawkes.
1518 - Further use of explicit_bzero has been added in various buffer
1519 handling code paths to guard against compilers aggressively doing
1520 dead-store removal.
1521
1522 -- Colin Watson <cjwatson@debian.org> Thu, 14 Jan 2016 15:28:03 +0000
1523
1524openssh (1:7.1p1-6) unstable; urgency=medium
1525
1526 [ Colin Watson ]
1527 * Remove explicit "XS-Testsuite: autopkgtest" from debian/control;
1528 dpkg-source now figures that out automatically based on the existence of
1529 debian/tests/control.
1530 * Allow authenticating as root using gssapi-keyex even with
1531 "PermitRootLogin prohibit-password" (closes: #809695).
1532 * Shuffle PROPOSAL_KEX_ALGS mangling for GSSAPI key exchange a little
1533 later in ssh_kex2 so that it's actually effective (closes: #809696).
1534
1535 [ Michael Biebl ]
1536 * Don't call sd_notify when sshd is re-execed (closes: #809035).
1537
1538 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2016 15:09:10 +0000
1539
1540openssh (1:7.1p1-5) unstable; urgency=medium
1541
1542 [ Michael Biebl ]
1543 * Add systemd readiness notification support (closes: #778913).
1544
1545 -- Colin Watson <cjwatson@debian.org> Mon, 21 Dec 2015 22:10:07 +0000
1546
1547openssh (1:7.1p1-4) unstable; urgency=medium
1548
1549 * Backport upstream patch to unbreak connections with peers that set
1550 first_kex_follows (LP: #1526357).
1551
1552 -- Colin Watson <cjwatson@debian.org> Tue, 15 Dec 2015 15:40:18 +0000
1553
1554openssh (1:7.1p1-3) unstable; urgency=medium
1555
1556 * Drop priority of openssh-client-ssh1 to extra (closes: #807518).
1557 * Redirect regression test input from /dev/zero, since otherwise conch
1558 will immediately send EOF.
1559
1560 -- Colin Watson <cjwatson@debian.org> Thu, 10 Dec 2015 15:12:10 +0000
1561
1562openssh (1:7.1p1-2) unstable; urgency=medium
1563
1564 * Really enable conch interoperability tests under autopkgtest.
1565 * Drop SSH1 keepalive patch. Now that SSH1 is disabled at compile-time,
1566 it's been rejected upstream and there isn't much point carrying it any
1567 more.
1568 * Add NEWS.Debian documenting cryptographic changes in OpenSSH 7.0
1569 (closes: #806962).
1570 * Add an openssh-client-ssh1 binary package for people who need to connect
1571 to outdated SSH1-only servers (closes: #807107).
1572 * Update "Subsystem sftp" path in example sshd_config (closes: #691004,
1573 LP: #1437005).
1574
1575 -- Colin Watson <cjwatson@debian.org> Tue, 08 Dec 2015 15:33:08 +0000
1576
1577openssh (1:7.1p1-1) unstable; urgency=medium
1578
1579 * New upstream release (http://www.openssh.com/txt/release-7.0, closes:
1580 #785190):
1581 - Support for the legacy SSH version 1 protocol is disabled by default
1582 at compile time.
1583 - Support for the 1024-bit diffie-hellman-group1-sha1 key exchange is
1584 disabled by default at run-time. It may be re-enabled using the
1585 instructions at http://www.openssh.com/legacy.html
1586 - Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled by
1587 default at run-time. These may be re-enabled using the instructions
1588 at http://www.openssh.com/legacy.html
1589 - Support for the legacy v00 cert format has been removed.
1590 - The default for the sshd_config(5) PermitRootLogin option has changed
1591 from "yes" to "prohibit-password".
1592 - PermitRootLogin=without-password/prohibit-password now bans all
1593 interactive authentication methods, allowing only public-key,
1594 hostbased and GSSAPI authentication (previously it permitted
1595 keyboard-interactive and password-less authentication if those were
1596 enabled).
1597 - ssh_config(5): Add PubkeyAcceptedKeyTypes option to control which
1598 public key types are available for user authentication.
1599 - sshd_config(5): Add HostKeyAlgorithms option to control which public
1600 key types are offered for host authentications.
1601 - ssh(1), sshd(8): Extend Ciphers, MACs, KexAlgorithms,
1602 HostKeyAlgorithms, PubkeyAcceptedKeyTypes and HostbasedKeyTypes
1603 options to allow appending to the default set of algorithms instead of
1604 replacing it. Options may now be prefixed with a '+' to append to the
1605 default, e.g. "HostKeyAlgorithms=+ssh-dss".
1606 - sshd_config(5): PermitRootLogin now accepts an argument of
1607 'prohibit-password' as a less-ambiguous synonym of 'without-
1608 password'.
1609 - ssh(1), sshd(8): Add compatability workarounds for Cisco and more
1610 PuTTY versions.
1611 - Fix some omissions and errors in the PROTOCOL and PROTOCOL.mux
1612 documentation relating to Unix domain socket forwarding.
1613 - ssh(1): Improve the ssh(1) manual page to include a better description
1614 of Unix domain socket forwarding (closes: #779068).
1615 - ssh(1), ssh-agent(1): Skip uninitialised PKCS#11 slots, fixing
1616 failures to load keys when they are present.
1617 - ssh(1), ssh-agent(1): Do not ignore PKCS#11 hosted keys that wth empty
1618 CKA_ID.
1619 - sshd(8): Clarify documentation for UseDNS option.
1620 - Check realpath(3) behaviour matches what sftp-server requires and use
1621 a replacement if necessary.
1622 * New upstream release (http://www.openssh.com/txt/release-7.1):
1623 - sshd(8): OpenSSH 7.0 contained a logic error in PermitRootLogin=
1624 prohibit-password/without-password that could, depending on
1625 compile-time configuration, permit password authentication to root
1626 while preventing other forms of authentication. This problem was
1627 reported by Mantas Mikulenas.
1628 - ssh(1), sshd(8): Add compatibility workarounds for FuTTY.
1629 - ssh(1), sshd(8): Refine compatibility workarounds for WinSCP.
1630 - Fix a number of memory faults (double-free, free of uninitialised
1631 memory, etc) in ssh(1) and ssh-keygen(1). Reported by Mateusz
1632 Kocielski.
1633 * Change "PermitRootLogin without-password" to the new preferred spelling
1634 of "PermitRootLogin prohibit-password" in sshd_config, and update
1635 documentation to reflect the new upstream default.
1636 * Enable conch interoperability tests under autopkgtest.
1637
1638 -- Colin Watson <cjwatson@debian.org> Wed, 02 Dec 2015 20:18:35 +0000
1639
1640openssh (1:6.9p1-3) unstable; urgency=medium
1641
1642 * ssh_config(5): Fix markup errors in description of GSSAPITrustDns
1643 (closes: #799271).
1644 * Fix dh_install and dh_fixperms overrides to work properly with an
1645 architecture-independent-only build (closes: #806090).
1646 * Do much less work in architecture-independent-only builds.
1647 * Drop ConsoleKit session registration patch; it was only ever enabled for
1648 Ubuntu, which no longer needs it (LP: #1334916, #1502045).
1649
1650 -- Colin Watson <cjwatson@debian.org> Tue, 24 Nov 2015 22:48:53 +0000
1651
1652openssh (1:6.9p1-2) unstable; urgency=medium
1653
1654 [ Colin Watson ]
1655 * mention-ssh-keygen-on-keychange.patch: Move example ssh-keygen
1656 invocation onto a separate line to make it easier to copy and paste
1657 (LP: #1491532).
1658
1659 [ Tyler Hicks ]
1660 * Build with audit support on Linux (closes: #797727, LP: #1478087).
1661
1662 -- Colin Watson <cjwatson@debian.org> Thu, 10 Sep 2015 12:26:11 +0100
1663
1664openssh (1:6.9p1-1) unstable; urgency=medium
1665
1666 * New upstream release (http://www.openssh.com/txt/release-6.8):
1667 - sshd(8): UseDNS now defaults to 'no'. Configurations that match
1668 against the client host name (via sshd_config or authorized_keys) may
1669 need to re-enable it or convert to matching against addresses.
1670 - Add FingerprintHash option to ssh(1) and sshd(8), and equivalent
1671 command-line flags to the other tools to control algorithm used for
1672 key fingerprints. The default changes from MD5 to SHA256 and format
1673 from hex to base64.
1674 Fingerprints now have the hash algorithm prepended. An example of the
1675 new format: SHA256:mVPwvezndPv/ARoIadVY98vAC0g+P/5633yTC4d/wXE
1676 Please note that visual host keys will also be different.
1677 - ssh(1), sshd(8): Experimental host key rotation support. Add a
1678 protocol extension for a server to inform a client of all its
1679 available host keys after authentication has completed. The client
1680 may record the keys in known_hosts, allowing it to upgrade to better
1681 host key algorithms and a server to gracefully rotate its keys.
1682 The client side of this is controlled by a UpdateHostkeys config
1683 option (default off).
1684 - ssh(1): Add a ssh_config HostbasedKeyType option to control which host
1685 public key types are tried during host-based authentication.
1686 - ssh(1), sshd(8): Fix connection-killing host key mismatch errors when
1687 sshd offers multiple ECDSA keys of different lengths.
1688 - ssh(1): When host name canonicalisation is enabled, try to parse host
1689 names as addresses before looking them up for canonicalisation. Fixes
1690 bz#2074 and avoids needless DNS lookups in some cases.
1691 - ssh(1), ssh-keysign(8): Make ed25519 keys work for host based
1692 authentication.
1693 - sshd(8): SSH protocol v.1 workaround for the Meyer, et al,
1694 Bleichenbacher Side Channel Attack. Fake up a bignum key before RSA
1695 decryption.
1696 - sshd(8): Remember which public keys have been used for authentication
1697 and refuse to accept previously-used keys. This allows
1698 AuthenticationMethods=publickey,publickey to require that users
1699 authenticate using two _different_ public keys.
1700 - sshd(8): add sshd_config HostbasedAcceptedKeyTypes and
1701 PubkeyAcceptedKeyTypes options to allow sshd to control what public
1702 key types will be accepted (closes: #481133). Currently defaults to
1703 all.
1704 - sshd(8): Don't count partial authentication success as a failure
1705 against MaxAuthTries.
1706 - ssh(1): Add RevokedHostKeys option for the client to allow text-file
1707 or KRL-based revocation of host keys.
1708 - ssh-keygen(1), sshd(8): Permit KRLs that revoke certificates by serial
1709 number or key ID without scoping to a particular CA.
1710 - ssh(1): Add a "Match canonical" criteria that allows ssh_config Match
1711 blocks to trigger only in the second config pass.
1712 - ssh(1): Add a -G option to ssh that causes it to parse its
1713 configuration and dump the result to stdout, similar to "sshd -T".
1714 - ssh(1): Allow Match criteria to be negated. E.g. "Match !host".
1715 - ssh-keyscan(1): ssh-keyscan has been made much more robust against
1716 servers that hang or violate the SSH protocol (closes: #241119).
1717 - ssh(1), ssh-keygen(1): Fix regression bz#2306: Key path names were
1718 being lost as comment fields (closes: #787776).
1719 - ssh(1): Allow ssh_config Port options set in the second config parse
1720 phase to be applied (they were being ignored; closes: #774369).
1721 - ssh(1): Tweak config re-parsing with host canonicalisation - make the
1722 second pass through the config files always run when host name
1723 canonicalisation is enabled (and not whenever the host name changes)
1724 - ssh(1): Fix passing of wildcard forward bind addresses when connection
1725 multiplexing is in use.
1726 - ssh-keygen(1): Fix broken private key conversion from non-OpenSSH
1727 formats.
1728 - ssh-keygen(1): Fix KRL generation bug when multiple CAs are in use.
1729 * New upstream release (http://www.openssh.com/txt/release-6.9):
1730 - CVE-2015-5352: ssh(1): When forwarding X11 connections with
1731 ForwardX11Trusted=no, connections made after ForwardX11Timeout expired
1732 could be permitted and no longer subject to XSECURITY restrictions
1733 because of an ineffective timeout check in ssh(1) coupled with "fail
1734 open" behaviour in the X11 server when clients attempted connections
1735 with expired credentials (closes: #790798). This problem was reported
1736 by Jann Horn.
1737 - SECURITY: ssh-agent(1): Fix weakness of agent locking (ssh-add -x) to
1738 password guessing by implementing an increasing failure delay, storing
1739 a salted hash of the password rather than the password itself and
1740 using a timing-safe comparison function for verifying unlock attempts.
1741 This problem was reported by Ryan Castellucci.
1742 - sshd(8): Support admin-specified arguments to AuthorizedKeysCommand
1743 (closes: #740494).
1744 - sshd(8): Add AuthorizedPrincipalsCommand that allows retrieving
1745 authorized principals information from a subprocess rather than a
1746 file.
1747 - ssh(1), ssh-add(1): Support PKCS#11 devices with external PIN entry
1748 devices.
1749 - ssh-keygen(1): Support "ssh-keygen -lF hostname" to search known_hosts
1750 and print key hashes rather than full keys.
1751 - ssh-agent(1): Add -D flag to leave ssh-agent in foreground without
1752 enabling debug mode.
1753 - ssh(1), sshd(8): Deprecate legacy SSH2_MSG_KEX_DH_GEX_REQUEST_OLD
1754 message and do not try to use it against some 3rd-party SSH
1755 implementations that use it (older PuTTY, WinSCP).
1756 - ssh(1), sshd(8): Cap DH-GEX group size at 4Kbits for Cisco
1757 implementations as some would fail when attempting to use group sizes
1758 >4K (closes: #740307, LP: #1287222).
1759 - ssh(1): Fix out-of-bound read in EscapeChar configuration option
1760 parsing.
1761 - sshd(8): Fix application of PermitTunnel, LoginGraceTime,
1762 AuthenticationMethods and StreamLocalBindMask options in Match blocks.
1763 - ssh(1), sshd(8): Improve disconnection message on TCP reset.
1764 - ssh(1): Remove failed remote forwards established by multiplexing from
1765 the list of active forwards.
1766 - sshd(8): Make parsing of authorized_keys "environment=" options
1767 independent of PermitUserEnv being enabled.
1768 - sshd(8): Fix post-auth crash with permitopen=none (closes: #778807).
1769 - ssh(1), ssh-add(1), ssh-keygen(1): Allow new-format private keys to be
1770 encrypted with AEAD ciphers.
1771 - ssh(1): Allow ListenAddress, Port and AddressFamily configuration
1772 options to appear in any order.
1773 - sshd(8): Check for and reject missing arguments for VersionAddendum
1774 and ForceCommand.
1775 - ssh(1), sshd(8): Don't treat unknown certificate extensions as fatal.
1776 - ssh-keygen(1): Make stdout and stderr output consistent.
1777 - ssh(1): Mention missing DISPLAY environment in debug log when X11
1778 forwarding requested.
1779 - sshd(8): Correctly record login when UseLogin is set.
1780 - sshd(8): Add some missing options to sshd -T output and fix output of
1781 VersionAddendum and HostCertificate.
1782 - Document and improve consistency of options that accept a "none"
1783 argument: TrustedUserCAKeys, RevokedKeys, AuthorizedPrincipalsFile.
1784 - ssh(1): Include remote username in debug output.
1785 - sshd(8): Avoid compatibility problem with some versions of Tera Term,
1786 which would crash when they received the hostkeys notification message
1787 (hostkeys-00@openssh.com).
1788 - sshd(8): Mention ssh-keygen -E as useful when comparing legacy MD5
1789 host key fingerprints.
1790 - ssh(1): Clarify pseudo-terminal request behaviour and make manual
1791 language consistent.
1792 - ssh(1): Document that the TERM environment variable is not subject to
1793 SendEnv and AcceptEnv; bz#2386
1794 - sshd(8): Format UsePAM setting when using sshd -T (closes: #767648).
1795 - moduli(5): Update DH-GEX moduli (closes: #787037).
1796 * There are some things I want to fix before upgrading to 7.0p1, though I
1797 intend to do that soon. In the meantime, backport some patches, mainly
1798 to fix security issues:
1799 - SECURITY: sshd(8): OpenSSH 6.8 and 6.9 incorrectly set TTYs to be
1800 world-writable. Local attackers may be able to write arbitrary
1801 messages to logged-in users, including terminal escape sequences.
1802 Reported by Nikolay Edigaryev.
1803 - SECURITY: sshd(8): Fixed a privilege separation weakness related to
1804 PAM support. Attackers who could successfully compromise the
1805 pre-authentication process for remote code execution and who had valid
1806 credentials on the host could impersonate other users. Reported by
1807 Moritz Jodeit.
1808 - SECURITY: sshd(8): Fixed a use-after-free bug related to PAM support
1809 that was reachable by attackers who could compromise the
1810 pre-authentication process for remote code execution (closes:
1811 #795711). Also reported by Moritz Jodeit.
1812 - CVE-2015-5600: sshd(8): Fix circumvention of MaxAuthTries using
1813 keyboard-interactive authentication (closes: #793616). By specifying
1814 a long, repeating keyboard-interactive "devices" string, an attacker
1815 could request the same authentication method be tried thousands of
1816 times in a single pass. The LoginGraceTime timeout in sshd(8) and any
1817 authentication failure delays implemented by the authentication
1818 mechanism itself were still applied. Found by Kingcope.
1819 - Let principals-command.sh work for noexec /var/run.
1820 * Thanks to Jakub Jelen of Red Hat for Fedora's rebased version of the
1821 GSSAPI key exchange patch.
1822 * Document the Debian-specific change to the default value of
1823 ForwardX11Trusted in ssh(1) (closes: #781469).
1824
1825 -- Colin Watson <cjwatson@debian.org> Thu, 20 Aug 2015 10:38:58 +0100
1826
1827openssh (1:6.7p1-6) unstable; urgency=medium
1828
1829 [ Martin Pitt ]
1830 * openssh-server.postinst: Quiesce "Unable to connect to Upstart" error
1831 message from initctl if upstart is installed, but not the current init
1832 system. (LP: #1440070)
1833 * openssh-server.postinst: Fix version comparisons of upgrade adjustments
1834 to not apply to fresh installs.
1835
1836 -- Colin Watson <cjwatson@debian.org> Sun, 19 Apr 2015 14:32:43 +0100
1837
1838openssh (1:6.7p1-5) unstable; urgency=medium
1839
1840 * Revert change from previous upload, which causes far more trouble than
1841 it is worth (closes: #780797):
1842 - Send/accept only specific known LC_* variables, rather than using a
1843 wildcard.
1844 * Add a NEWS.Debian entry documenting this reversion, as it is too
1845 difficult to undo the sshd_config change automatically without
1846 compounding the problem of (arguably) overwriting user configuration.
1847
1848 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:20:56 +0000
1849
1850openssh (1:6.7p1-4) unstable; urgency=medium
1851
1852 * Send/accept only specific known LC_* variables, rather than using a
1853 wildcard (closes: #765633).
1854 * Document interactions between ListenAddress/Port and ssh.socket in
1855 README.Debian (closes: #764842).
1856 * Debconf translations:
1857 - Brazilian Portuguese (thanks, José de Figueiredo; closes: #771859).
1858
1859 -- Colin Watson <cjwatson@debian.org> Wed, 18 Mar 2015 15:34:13 +0000
1860
1861openssh (1:6.7p1-3) unstable; urgency=medium
1862
1863 * Debconf translations:
1864 - Dutch (thanks, Frans Spiesschaert; closes: #765851).
1865 * Assume that dpkg-statoverride exists and drop the test for an obsolete
1866 compatibility path.
1867
1868 -- Colin Watson <cjwatson@debian.org> Mon, 03 Nov 2014 20:29:52 +0000
1869
1870openssh (1:6.7p1-2) unstable; urgency=medium
1871
1872 * debian/tests/control: Drop isolation-container, since the tests run on a
1873 high port. They're still not guaranteed to run correctly in an schroot,
1874 but may manage to work, so this lets the tests at least try to run on
1875 ci.debian.net.
1876
1877 -- Colin Watson <cjwatson@debian.org> Fri, 10 Oct 2014 10:47:19 +0100
1878
1879openssh (1:6.7p1-1) unstable; urgency=medium
1880
1881 * New upstream release (http://www.openssh.com/txt/release-6.7):
1882 - sshd(8): The default set of ciphers and MACs has been altered to
1883 remove unsafe algorithms. In particular, CBC ciphers and arcfour* are
1884 disabled by default. The full set of algorithms remains available if
1885 configured explicitly via the Ciphers and MACs sshd_config options.
1886 - ssh(1), sshd(8): Add support for Unix domain socket forwarding. A
1887 remote TCP port may be forwarded to a local Unix domain socket and
1888 vice versa or both ends may be a Unix domain socket (closes: #236718).
1889 - ssh(1), ssh-keygen(1): Add support for SSHFP DNS records for ED25519
1890 key types.
1891 - sftp(1): Allow resumption of interrupted uploads.
1892 - ssh(1): When rekeying, skip file/DNS lookups of the hostkey if it is
1893 the same as the one sent during initial key exchange.
1894 - sshd(8): Allow explicit ::1 and 127.0.0.1 forwarding bind addresses
1895 when GatewayPorts=no; allows client to choose address family.
1896 - sshd(8): Add a sshd_config PermitUserRC option to control whether
1897 ~/.ssh/rc is executed, mirroring the no-user-rc authorized_keys
1898 option.
1899 - ssh(1): Add a %C escape sequence for LocalCommand and ControlPath that
1900 expands to a unique identifier based on a hash of the tuple of (local
1901 host, remote user, hostname, port). Helps avoid exceeding miserly
1902 pathname limits for Unix domain sockets in multiplexing control paths.
1903 - sshd(8): Make the "Too many authentication failures" message include
1904 the user, source address, port and protocol in a format similar to the
1905 authentication success / failure messages.
1906 - Use CLOCK_BOOTTIME in preference to CLOCK_MONOTONIC when it is
1907 available. It considers time spent suspended, thereby ensuring
1908 timeouts (e.g. for expiring agent keys) fire correctly (closes:
1909 #734553).
1910 - Use prctl() to prevent sftp-server from accessing
1911 /proc/self/{mem,maps}.
1912 * Restore TCP wrappers support, removed upstream in 6.7. It is true that
1913 dropping this reduces preauth attack surface in sshd. On the other
1914 hand, this support seems to be quite widely used, and abruptly dropping
1915 it (from the perspective of users who don't read openssh-unix-dev) could
1916 easily cause more serious problems in practice. It's not entirely clear
1917 what the right long-term answer for Debian is, but it at least probably
1918 doesn't involve dropping this feature shortly before a freeze.
1919 * Replace patch to disable OpenSSL version check with an updated version
1920 of Kurt Roeckx's patch from #732940 to just avoid checking the status
1921 field.
1922 * Build-depend on a new enough dpkg-dev for dpkg-buildflags, rather than
1923 simply a new enough dpkg.
1924 * Simplify debian/rules using /usr/share/dpkg/buildflags.mk.
1925 * Use Package-Type rather than XC-Package-Type, now that it is an official
1926 field.
1927 * Run a subset of the upstream regression test suite at package build
1928 time, and the rest of it under autopkgtest.
1929
1930 -- Colin Watson <cjwatson@debian.org> Thu, 09 Oct 2014 14:05:56 +0100
1931
1932openssh (1:6.6p1-8) unstable; urgency=medium
1933
1934 * Make the if-up hook use "reload" rather than "restart" if the system was
1935 booted using systemd (closes: #756547).
1936 * Show fingerprints of new keys after creating them in the postinst
1937 (closes: #762128).
1938 * Policy version 3.9.6: no changes required.
1939 * Don't link /usr/share/doc/ssh to openssh-client, as this is not safe
1940 between Architecture: all and Architecture: any binary packages (closes:
1941 #763375).
1942
1943 -- Colin Watson <cjwatson@debian.org> Fri, 03 Oct 2014 12:23:57 +0100
1944
1945openssh (1:6.6p1-7) unstable; urgency=medium
1946
1947 * Make sure that DEB_HOST_ARCH is set, even when invoking debian/rules
1948 directly.
1949 * Use dh-exec to simplify override_dh_install target.
1950 * Remove several unnecessary entries in debian/*.dirs.
1951 * Pass noupdate to the second call to pam_motd, not the first (thanks, Ken
1952 T Takusagawa; closes: #757059).
1953 * Debconf translations:
1954 - Turkish (thanks, Mert Dirik; closes: #756757).
1955
1956 -- Colin Watson <cjwatson@debian.org> Tue, 05 Aug 2014 09:10:04 +0100
1957
1958openssh (1:6.6p1-6) unstable; urgency=medium
1959
1960 * Upgrade to debhelper v9.
1961 * Only use pam_keyinit on Linux architectures (closes: #747245).
1962 * Make get_config_option more robust against trailing whitespace (thanks,
1963 LaMont Jones).
1964 * Debconf translations:
1965 - Czech (thanks, Michal Šimůnek; closes: #751419).
1966
1967 -- Colin Watson <cjwatson@debian.org> Sat, 28 Jun 2014 14:50:04 +0100
1968
1969openssh (1:6.6p1-5) unstable; urgency=medium
1970
1971 * Force ssh-agent Upstart job to use sh syntax regardless of the user's
1972 shell (thanks, Steffen Stempel; LP: #1312928).
1973
1974 -- Colin Watson <cjwatson@debian.org> Thu, 01 May 2014 16:27:53 +0100
1975
1976openssh (1:6.6p1-4) unstable; urgency=medium
1977
1978 * Debconf translations:
1979 - Spanish (thanks, Matías Bellone; closes: #744867).
1980 * Apply upstream-recommended patch to fix bignum encoding for
1981 curve25519-sha256@libssh.org, fixing occasional key exchange failures.
1982
1983 -- Colin Watson <cjwatson@debian.org> Mon, 21 Apr 2014 21:29:53 +0100
1984
1985openssh (1:6.6p1-3) unstable; urgency=medium
1986
1987 * Debconf translations:
1988 - French (thanks, Étienne Gilli; closes: #743242).
1989 * Never signal the service supervisor with SIGSTOP more than once, to
1990 prevent a hang on re-exec (thanks, Robie Basak; LP: #1306877).
1991
1992 -- Colin Watson <cjwatson@debian.org> Mon, 14 Apr 2014 12:11:50 +0100
1993
1994openssh (1:6.6p1-2) unstable; urgency=medium
1995
1996 * If no root password is set, then switch to "PermitRootLogin
1997 without-password" without asking (LP: #1300127).
1998
1999 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2014 12:20:46 +0100
2000
2001openssh (1:6.6p1-1) unstable; urgency=medium
2002
2003 [ Colin Watson ]
2004 * Apply various warning-suppression and regression-test fixes to
2005 gssapi.patch from Damien Miller.
2006 * New upstream release (http://www.openssh.com/txt/release-6.6,
2007 LP: #1298280):
2008 - CVE-2014-2532: sshd(8): when using environment passing with an
2009 sshd_config(5) AcceptEnv pattern with a wildcard, OpenSSH prior to 6.6
2010 could be tricked into accepting any environment variable that contains
2011 the characters before the wildcard character.
2012 * Re-enable btmp logging, as its permissions were fixed a long time ago in
2013 response to #370050 (closes: #341883).
2014 * Change to "PermitRootLogin without-password" for new installations, and
2015 ask a debconf question when upgrading systems with "PermitRootLogin yes"
2016 from previous versions (closes: #298138).
2017 * Debconf translations:
2018 - Danish (thanks, Joe Hansen).
2019 - Portuguese (thanks, Américo Monteiro).
2020 - Russian (thanks, Yuri Kozlov; closes: #742308).
2021 - Swedish (thanks, Andreas Rönnquist).
2022 - Japanese (thanks, victory).
2023 - German (thanks, Stephan Beck; closes: #742541).
2024 - Italian (thanks, Beatrice Torracca).
2025 * Don't start ssh-agent from the Upstart user session job if something
2026 like Xsession has already done so (based on work by Bruno Vasselle;
2027 LP: #1244736).
2028
2029 [ Matthew Vernon ]
2030 * CVE-2014-2653: Fix failure to check SSHFP records if server presents a
2031 certificate (bug reported by me, patch by upstream's Damien Miller;
2032 thanks also to Mark Wooding for his help in fixing this) (Closes:
2033 #742513)
2034
2035 -- Colin Watson <cjwatson@debian.org> Fri, 28 Mar 2014 18:04:41 +0000
2036
2037openssh (1:6.5p1-6) unstable; urgency=medium
2038
2039 * Fix Breaks/Replaces versions of openssh-sftp-server on openssh-server
2040 (thanks, Axel Beckert).
2041
2042 -- Colin Watson <cjwatson@debian.org> Thu, 06 Mar 2014 16:18:44 +0000
2043
2044openssh (1:6.5p1-5) unstable; urgency=medium
2045
2046 [ Colin Watson ]
2047 * Add Alias=sshd.service to systemd ssh.service file, to match "Provides:
2048 sshd" in the sysvinit script (thanks, Michael Biebl).
2049 * Add Before=ssh.service to systemd ssh.socket file, since otherwise
2050 nothing guarantees that ssh.service has stopped before ssh.socket starts
2051 (thanks, Uoti Urpala).
2052
2053 [ Axel Beckert ]
2054 * Split sftp-server into its own package to allow it to also be used by
2055 other SSH server implementations like dropbear (closes: #504290).
2056
2057 -- Colin Watson <cjwatson@debian.org> Wed, 05 Mar 2014 13:53:08 +0000
2058
2059openssh (1:6.5p1-4) unstable; urgency=medium
2060
2061 * Configure --without-hardening on hppa, to work around
2062 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 (closes: #738798).
2063 * Amend "Running sshd from inittab" instructions in README.Debian to
2064 recommend 'update-rc.d ssh disable', rather than manual removal of rc*.d
2065 symlinks that won't work with dependency-based sysv-rc.
2066 * Remove code related to non-dependency-based sysv-rc ordering, since that
2067 is no longer supported.
2068 * Apply patch from https://bugzilla.mindrot.org/show_bug.cgi?id=2200 to
2069 fix getsockname errors when using "ssh -W" (closes: #738693).
2070
2071 -- Colin Watson <cjwatson@debian.org> Sat, 15 Feb 2014 02:19:36 +0000
2072
2073openssh (1:6.5p1-3) unstable; urgency=medium
2074
2075 * Clarify socket activation mode in README.Debian, as suggested by Uoti
2076 Urpala.
2077 * Stop claiming that "Protocol 2" is a Debian-specific default; this has
2078 been upstream's default since 5.4p1.
2079 * Avoid stdout noise from which(1) on purge of openssh-client.
2080 * Fix sysvinit->systemd transition code to cope with still-running
2081 sysvinit jobs being considered active by systemd (thanks, Uoti Urpala
2082 and Michael Biebl).
2083 * Bump guard version for sysvinit->systemd transition to 1:6.5p1-3; we may
2084 have got it wrong before, and it's fairly harmless to repeat it.
2085 * Remove tests for whether /dev/null is a character device from the
2086 Upstart job and the systemd service files; it's there to avoid a
2087 confusing failure mode in daemon(), but with modern init systems we use
2088 the -D option to suppress daemonisation anyway.
2089 * Refer to /usr/share/common-licenses/GPL-2 in debian/copyright (for the
2090 Debian patch) rather than plain GPL.
2091 * Drop some very old Conflicts and Replaces (ssh (<< 1:3.8.1p1-9),
2092 rsh-client (<< 0.16.1-1), ssh-krb5 (<< 1:4.3p2-7), ssh-nonfree (<< 2),
2093 and openssh-client (<< 1:3.8.1p1-11)). These all relate to pre-etch
2094 versions, for which we no longer have maintainer script code, and per
2095 policy they would have to become Breaks nowadays anyway.
2096 * Policy version 3.9.5.
2097 * Drop unnecessary -1 in zlib1g Build-Depends version.
2098 * Tweak dh_systemd_enable invocations to avoid lots of error noise.
2099
2100 -- Colin Watson <cjwatson@debian.org> Wed, 12 Feb 2014 13:10:08 +0000
2101
2102openssh (1:6.5p1-2) unstable; urgency=medium
2103
2104 * Only enable ssh.service for systemd, not both ssh.service and
2105 ssh.socket. Thanks to Michael Biebl for spotting this.
2106 * Backport upstream patch to unbreak case-sensitive matching of ssh_config
2107 (closes: #738619).
2108
2109 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 11:28:35 +0000
2110
2111openssh (1:6.5p1-1) unstable; urgency=medium
2112
2113 * New upstream release (http://www.openssh.com/txt/release-6.5,
2114 LP: #1275068):
2115 - ssh(1): Add support for client-side hostname canonicalisation using a
2116 set of DNS suffixes and rules in ssh_config(5). This allows
2117 unqualified names to be canonicalised to fully-qualified domain names
2118 to eliminate ambiguity when looking up keys in known_hosts or checking
2119 host certificate names (closes: #115286).
2120 * Switch to git; adjust Vcs-* fields.
2121 * Convert to git-dpm, and drop source package documentation associated
2122 with the old bzr/quilt patch handling workflow.
2123 * Drop ssh-vulnkey and the associated ssh/ssh-add/sshd integration code,
2124 leaving only basic configuration file compatibility, since it has been
2125 nearly six years since the original vulnerability and this code is not
2126 likely to be of much value any more (closes: #481853, #570651). See
2127 https://lists.debian.org/debian-devel/2013/09/msg00240.html for my full
2128 reasoning.
2129 * Add OpenPGP signature checking configuration to watch file (thanks,
2130 Daniel Kahn Gillmor; closes: #732441).
2131 * Add the pam_keyinit session module, to create a new session keyring on
2132 login (closes: #734816).
2133 * Incorporate default path changes from shadow 1:4.0.18.1-8, removing
2134 /usr/bin/X11 (closes: #644521).
2135 * Generate ED25519 host keys on fresh installations. Upgraders who wish
2136 to add such host keys should manually add 'HostKey
2137 /etc/ssh/ssh_host_ed25519_key' to /etc/ssh/sshd_config and run
2138 'ssh-keygen -q -f /etc/ssh/ssh_host_ed25519_key -N "" -t ed25519'.
2139 * Drop long-obsolete "SSH now uses protocol 2 by default" section from
2140 README.Debian.
2141 * Add systemd support (thanks, Sven Joachim; closes: #676830).
2142
2143 -- Colin Watson <cjwatson@debian.org> Mon, 10 Feb 2014 14:58:26 +0000
2144
2145openssh (1:6.4p1-2) unstable; urgency=high
2146
2147 * Increase ServerKeyBits value in package-generated sshd_config to 1024
2148 (closes: #727622, LP: #1244272).
2149 * Restore patch to disable OpenSSL version check (closes: #732940).
2150
2151 -- Colin Watson <cjwatson@debian.org> Mon, 23 Dec 2013 10:44:04 +0000
2152
2153openssh (1:6.4p1-1) unstable; urgency=high
2154
2155 * New upstream release. Important changes:
2156 - 6.3/6.3p1 (http://www.openssh.com/txt/release-6.3):
2157 + sftp(1): add support for resuming partial downloads using the
2158 "reget" command and on the sftp commandline or on the "get"
2159 commandline using the "-a" (append) option (closes: #158590).
2160 + ssh(1): add an "IgnoreUnknown" configuration option to selectively
2161 suppress errors arising from unknown configuration directives
2162 (closes: #436052).
2163 + sftp(1): update progressmeter when data is acknowledged, not when
2164 it's sent (partially addresses #708372).
2165 + ssh(1): do not fatally exit when attempting to cleanup multiplexing-
2166 created channels that are incompletely opened (closes: #651357).
2167 - 6.4/6.4p1 (http://www.openssh.com/txt/release-6.4):
2168 + CVE-2013-4548: sshd(8): fix a memory corruption problem triggered
2169 during rekeying when an AES-GCM cipher is selected (closes:
2170 #729029). Full details of the vulnerability are available at:
2171 http://www.openssh.com/txt/gcmrekey.adv
2172 * When running under Upstart, only consider the daemon started once it is
2173 ready to accept connections (by raising SIGSTOP at that point and using
2174 "expect stop").
2175
2176 -- Colin Watson <cjwatson@debian.org> Sat, 09 Nov 2013 18:24:16 +0000
2177
2178openssh (1:6.2p2-6) unstable; urgency=low
2179
2180 * Update config.guess and config.sub automatically at build time.
2181 dh_autoreconf does not take care of that by default because openssh does
2182 not use automake.
2183
2184 -- Colin Watson <cjwatson@debian.org> Tue, 02 Jul 2013 22:54:49 +0100
2185
2186openssh (1:6.2p2-5) unstable; urgency=low
2187
2188 [ Colin Watson ]
2189 * Document consequences of ssh-agent being setgid in ssh-agent(1); see
2190 #711623.
2191 * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and
2192 ssh-argv0.
2193
2194 [ Yolanda Robla ]
2195 * debian/rules: Include real distribution in SSH_EXTRAVERSION instead of
2196 hardcoding Debian (LP: #1195342).
2197
2198 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jun 2013 15:24:14 +0100
2199
2200openssh (1:6.2p2-4) unstable; urgency=low
2201
2202 * Fix non-portable shell in ssh-copy-id (closes: #711162).
2203 * Rebuild against debhelper 9.20130604 with fixed dependencies for
2204 invoke-rc.d and Upstart jobs (closes: #711159, #711364).
2205 * Set SELinux context on private host keys as well as public host keys
2206 (closes: #687436).
2207
2208 -- Colin Watson <cjwatson@debian.org> Thu, 06 Jun 2013 17:06:31 +0100
2209
2210openssh (1:6.2p2-3) unstable; urgency=low
2211
2212 * If the running init daemon is Upstart, then, on the first upgrade to
2213 this version, check whether sysvinit is still managing sshd; if so,
2214 manually stop it so that it can be restarted under upstart. We do this
2215 near the end of the postinst, so it shouldn't result in any appreciable
2216 extra window where sshd is not running during upgrade.
2217
2218 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 17:42:10 +0100
2219
2220openssh (1:6.2p2-2) unstable; urgency=low
2221
2222 * Change start condition of Upstart job to be just the standard "runlevel
2223 [2345]", rather than "filesystem or runlevel [2345]"; the latter makes
2224 it unreasonably difficult to ensure that urandom starts before ssh, and
2225 is not really necessary since one of static-network-up and failsafe-boot
2226 is guaranteed to happen and will trigger entry to the default runlevel,
2227 and we don't care about ssh starting before the network (LP: #1098299).
2228 * Drop conffile handling for direct upgrades from pre-split ssh package;
2229 this was originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a
2230 truly ghastly hack around a misbehaviour in sarge's dpkg. Since this is
2231 now four Debian releases ago, we can afford to drop this and simplify
2232 the packaging.
2233 * Remove ssh/use_old_init_script, which was a workaround for a very old
2234 bug in /etc/init.d/ssh. If anyone has ignored this for >10 years then
2235 they aren't going to be convinced now (closes: #214182).
2236 * Remove support for upgrading directly from ssh-nonfree.
2237 * Remove lots of maintainer script support for direct upgrades from
2238 pre-etch (three releases before current stable).
2239 * Add #DEBHELPER# tokens to openssh-client.postinst and
2240 openssh-server.postinst.
2241 * Replace old manual conffile handling code with dpkg-maintscript-helper,
2242 via dh_installdeb.
2243 * Switch to new unified layout for Upstart jobs as documented in
2244 https://wiki.ubuntu.com/UpstartCompatibleInitScripts: the init script
2245 checks for a running Upstart, and we now let dh_installinit handle most
2246 of the heavy lifting in maintainer scripts. Ubuntu users should be
2247 essentially unaffected except that sshd may no longer start
2248 automatically in chroots if the running Upstart predates 0.9.0; but the
2249 main goal is simply not to break when openssh-server is installed in a
2250 chroot.
2251 * Remove the check for vulnerable host keys; this was first added five
2252 years ago, and everyone should have upgraded through a version that
2253 applied these checks by now. The ssh-vulnkey tool and the blacklisting
2254 support in sshd are still here, at least for the moment.
2255 * This removes the last of our uses of debconf (closes: #221531).
2256 * Use the pam_loginuid session module (thanks, Laurent Bigonville; closes:
2257 #677440, LP: #1067779).
2258 * Bracket our session stack with calls to pam_selinux close/open (thanks,
2259 Laurent Bigonville; closes: #679458).
2260 * Fix dh_builddeb invocation so that we really use xz compression for
2261 binary packages, as intended since 1:6.1p1-2.
2262
2263 -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 09:07:42 +0100
2264
2265openssh (1:6.2p2-1) unstable; urgency=low
2266
2267 * New upstream release (http://www.openssh.com/txt/release-6.2p2):
2268 - Only warn for missing identity files that were explicitly specified
2269 (closes: #708275).
2270 - Fix bug in contributed contrib/ssh-copy-id script that could result in
2271 "rm *" being called on mktemp failure (closes: #708419).
2272
2273 -- Colin Watson <cjwatson@debian.org> Thu, 16 May 2013 14:05:06 +0100
2274
2275openssh (1:6.2p1-3) unstable; urgency=low
2276
2277 * Renumber Debian-specific additions to enum monitor_reqtype so that they
2278 fit within a single byte (thanks, Jason Conti; LP: #1179202).
2279
2280 -- Colin Watson <cjwatson@debian.org> Mon, 13 May 2013 10:56:04 +0100
2281
2282openssh (1:6.2p1-2) unstable; urgency=low
2283
2284 * Fix build failure on Ubuntu:
2285 - Include openbsd-compat/sys-queue.h from consolekit.c.
2286 - Fix consolekit mismerges in monitor.c and monitor_wrap.c.
2287
2288 -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 09:45:57 +0100
2289
2290openssh (1:6.2p1-1) unstable; urgency=low
2291
2292 * New upstream release (http://www.openssh.com/txt/release-6.2).
2293 - Add support for multiple required authentication in SSH protocol 2 via
2294 an AuthenticationMethods option (closes: #195716).
2295 - Fix Sophie Germain formula in moduli(5) (closes: #698612).
2296 - Update ssh-copy-id to Phil Hands' greatly revised version (closes:
2297 #99785, #322228, #620428; LP: #518883, #835901, #1074798).
2298 * Use dh-autoreconf.
2299
2300 -- Colin Watson <cjwatson@debian.org> Tue, 07 May 2013 11:48:16 +0100
2301
2302openssh (1:6.1p1-4) experimental; urgency=low
2303
2304 [ Gunnar Hjalmarsson ]
2305 * debian/openssh-server.sshd.pam: Explicitly state that ~/.pam_environment
2306 should be read, and move the pam_env calls from "auth" to "session" so
2307 that it's also read when $HOME is encrypted (LP: #952185).
2308
2309 [ Stéphane Graber ]
2310 * Add ssh-agent upstart user job. This implements something similar to
2311 the 90x11-common_ssh-agent Xsession script. That is, start ssh-agent
2312 and set the appropriate environment variables (closes: #703906).
2313
2314 -- Colin Watson <cjwatson@debian.org> Mon, 25 Mar 2013 16:58:04 +0000
2315
2316openssh (1:6.1p1-3) experimental; urgency=low
2317
2318 * Give ssh and ssh-krb5 versioned dependencies on openssh-client and
2319 openssh-server, to try to reduce confusion when people run 'apt-get
2320 install ssh' or similar and expect that to upgrade everything relevant.
2321 * CVE-2010-5107: Improve DoS resistance by changing default of MaxStartups
2322 to 10:30:100 (closes: #700102).
2323
2324 -- Colin Watson <cjwatson@debian.org> Fri, 08 Feb 2013 21:07:31 +0000
2325
2326openssh (1:6.1p1-2) experimental; urgency=low
2327
2328 * Use xz compression for binary packages.
2329 * Merge from Ubuntu:
2330 - Add support for registering ConsoleKit sessions on login. (This is
2331 currently enabled only when building for Ubuntu.)
2332 - Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's
2333 been long enough since the relevant vulnerability that we shouldn't
2334 need these installed by default nowadays.
2335 - Add an Upstart job (not currently used by default in Debian).
2336 - Add mention of ssh-keygen in ssh connect warning (Scott Moser).
2337 - Install apport hooks.
2338 * Only build with -j if DEB_BUILD_OPTIONS=parallel=* is used (closes:
2339 #694282).
2340
2341 -- Colin Watson <cjwatson@debian.org> Mon, 26 Nov 2012 16:39:07 +0000
2342
2343openssh (1:6.1p1-1) experimental; urgency=low
2344
2345 * New upstream release (http://www.openssh.com/txt/release-6.1).
2346 - Enable pre-auth sandboxing by default for new installs.
2347 - Allow "PermitOpen none" to refuse all port-forwarding requests
2348 (closes: #543683).
2349
2350 -- Colin Watson <cjwatson@debian.org> Fri, 07 Sep 2012 00:22:44 +0100
2351
2352openssh (1:6.0p1-3) unstable; urgency=low
2353
2354 * debconf template translations:
2355 - Add Indonesian (thanks, Andika Triwidada; closes: #681670).
2356 * Call restorecon on copied ~/.ssh/authorized_keys if possible, since some
2357 SELinux policies require this (closes: #658675).
2358 * Add ncurses-term to openssh-server's Recommends, since it's often needed
2359 to support unusual terminal emulators on clients (closes: #675362).
2360
2361 -- Colin Watson <cjwatson@debian.org> Fri, 24 Aug 2012 06:55:36 +0100
2362
2363openssh (1:6.0p1-2) unstable; urgency=low
2364
2365 * Tighten libssl1.0.0 and libcrypto1.0.0-udeb dependencies to the current
2366 "fix" version at build time (closes: #678661).
2367
2368 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jun 2012 12:16:06 +0100
2369
2370openssh (1:6.0p1-1) unstable; urgency=low
2371
2372 [ Roger Leigh ]
2373 * Display dynamic part of MOTD from /run/motd.dynamic, if it exists
2374 (closes: #669699).
2375
2376 [ Colin Watson ]
2377 * Update OpenSSH FAQ to revision 1.113, fixing missing line break (closes:
2378 #669667).
2379 * New upstream release (closes: #671010,
2380 http://www.openssh.com/txt/release-6.0).
2381 - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections
2382 (closes: #643312, #650512, #671075).
2383 - Add a new privilege separation sandbox implementation for Linux's new
2384 seccomp sandbox, automatically enabled on platforms that support it.
2385 (Note: privilege separation sandboxing is still experimental.)
2386 * Fix a bashism in configure's seccomp_filter check.
2387 * Add a sandbox fallback mechanism, so that behaviour on Linux depends on
2388 whether the running system's kernel has seccomp_filter support, not the
2389 build system's kernel (forwarded upstream as
2390 https://bugzilla.mindrot.org/show_bug.cgi?id=2011).
2391
2392 -- Colin Watson <cjwatson@debian.org> Sat, 26 May 2012 13:48:14 +0100
2393
2394openssh (1:5.9p1-5) unstable; urgency=low
2395
2396 * Use dpkg-buildflags, including for hardening support; drop use of
2397 hardening-includes.
2398 * Fix cross-building:
2399 - Allow using a cross-architecture pkg-config.
2400 - Pass default LDFLAGS to contrib/Makefile.
2401 - Allow dh_strip to strip gnome-ssh-askpass, rather than calling
2402 'install -s'.
2403
2404 -- Colin Watson <cjwatson@debian.org> Mon, 02 Apr 2012 11:20:33 +0100
2405
2406openssh (1:5.9p1-4) unstable; urgency=low
2407
2408 * Disable OpenSSL version check again, as its SONAME is sufficient
2409 nowadays (closes: #664383).
2410
2411 -- Colin Watson <cjwatson@debian.org> Mon, 19 Mar 2012 11:06:30 +0000
2412
2413openssh (1:5.9p1-3) unstable; urgency=low
2414
2415 * debconf template translations:
2416 - Update Polish (thanks, Michał Kułach; closes: #659829).
2417 * Ignore errors writing to console in init script (closes: #546743).
2418 * Move ssh-krb5 to Section: oldlibs.
2419
2420 -- Colin Watson <cjwatson@debian.org> Fri, 24 Feb 2012 08:56:18 +0000
2421
2422openssh (1:5.9p1-2) unstable; urgency=low
2423
2424 * Mark openssh-client and openssh-server as Multi-Arch: foreign.
2425
2426 -- Colin Watson <cjwatson@debian.org> Wed, 09 Nov 2011 02:06:48 +0000
2427
2428openssh (1:5.9p1-1) unstable; urgency=low
2429
2430 * New upstream release (http://www.openssh.com/txt/release-5.9).
2431 - Introduce sandboxing of the pre-auth privsep child using an optional
2432 sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
2433 mandatory restrictions on the syscalls the privsep child can perform.
2434 - Add new SHA256-based HMAC transport integrity modes from
2435 http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt.
2436 - The pre-authentication sshd(8) privilege separation slave process now
2437 logs via a socket shared with the master process, avoiding the need to
2438 maintain /dev/log inside the chroot (closes: #75043, #429243,
2439 #599240).
2440 - ssh(1) now warns when a server refuses X11 forwarding (closes:
2441 #504757).
2442 - sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths,
2443 separated by whitespace (closes: #76312). The authorized_keys2
2444 fallback is deprecated but documented (closes: #560156).
2445 - ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4
2446 ToS/DSCP (closes: #498297).
2447 - ssh-add(1) now accepts keys piped from standard input. E.g. "ssh-add
2448 - < /path/to/key" (closes: #229124).
2449 - Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691).
2450 - Say "required" rather than "recommended" in unprotected-private-key
2451 warning (LP: #663455).
2452 * Update OpenSSH FAQ to revision 1.112.
2453
2454 -- Colin Watson <cjwatson@debian.org> Wed, 07 Sep 2011 23:46:00 +0100
2455
2456openssh (1:5.8p1-7) unstable; urgency=low
2457
2458 * Only recommend ssh-import-id when built on Ubuntu (closes: #635887).
2459 * Use 'dpkg-vendor --derives-from Ubuntu' to detect Ubuntu systems rather
2460 than 'lsb_release -is' so that Ubuntu derivatives behave the same way as
2461 Ubuntu itself.
2462
2463 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 14:27:52 +0100
2464
2465openssh (1:5.8p1-6) unstable; urgency=low
2466
2467 * openssh-client and openssh-server Suggests: monkeysphere.
2468 * Quieten logs when multiple from= restrictions are used in different
2469 authorized_keys lines for the same key; it's still not ideal, but at
2470 least you'll only get one log entry per key (closes: #630606).
2471 * Merge from Ubuntu (Dustin Kirkland):
2472 - openssh-server Recommends: ssh-import-id (no-op in Debian since that
2473 package doesn't exist there, but this reduces the Ubuntu delta).
2474
2475 -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2011 17:10:18 +0100
2476
2477openssh (1:5.8p1-5) unstable; urgency=low
2478
2479 * Drop openssh-server's dependency on openssh-blacklist to a
2480 recommendation (closes: #622604).
2481 * Update Vcs-* fields and README.source for Alioth changes.
2482 * Backport from upstream:
2483 - Make hostbased auth with ECDSA keys work correctly (closes: #633368).
2484
2485 -- Colin Watson <cjwatson@debian.org> Sun, 24 Jul 2011 11:06:47 +0100
2486
2487openssh (1:5.8p1-4) unstable; urgency=low
2488
2489 * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb,
2490 since the required minimum versions are rather old now anyway and
2491 openssl has bumped its SONAME (thanks, Julien Cristau; closes: #620828).
2492 * Remove unreachable code from openssh-server.postinst.
2493
2494 -- Colin Watson <cjwatson@debian.org> Mon, 04 Apr 2011 15:56:18 +0100
2495
2496openssh (1:5.8p1-3) unstable; urgency=low
2497
2498 * Correct ssh-keygen instruction in the changelog for 1:5.7p1-1 (thanks,
2499 Joel Stanley).
2500 * Allow ssh-add to read from FIFOs (thanks, Daniel Kahn Gillmor; closes:
2501 #614897).
2502
2503 -- Colin Watson <cjwatson@debian.org> Fri, 18 Mar 2011 16:42:42 +0000
2504
2505openssh (1:5.8p1-2) unstable; urgency=low
2506
2507 * Upload to unstable.
2508
2509 -- Colin Watson <cjwatson@debian.org> Tue, 08 Feb 2011 10:59:17 +0000
2510
2511openssh (1:5.8p1-1) experimental; urgency=low
2512
2513 * New upstream release (http://www.openssh.com/txt/release-5.8):
2514 - Fix stack information leak in legacy certificate signing
2515 (http://www.openssh.com/txt/legacy-cert.adv).
2516
2517 -- Colin Watson <cjwatson@debian.org> Sat, 05 Feb 2011 11:13:11 +0000
2518
2519openssh (1:5.7p1-2) experimental; urgency=low
2520
2521 * Fix crash in ssh_selinux_setfscreatecon when SELinux is disabled
2522 (LP: #708571).
2523
2524 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jan 2011 12:14:17 +0000
2525
2526openssh (1:5.7p1-1) experimental; urgency=low
2527
2528 * New upstream release (http://www.openssh.com/txt/release-5.7):
2529 - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
2530 and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA
2531 offer better performance than plain DH and DSA at the same equivalent
2532 symmetric key length, as well as much shorter keys.
2533 - sftp(1)/sftp-server(8): add a protocol extension to support a hard
2534 link operation. It is available through the "ln" command in the
2535 client. The old "ln" behaviour of creating a symlink is available
2536 using its "-s" option or through the preexisting "symlink" command.
2537 - scp(1): Add a new -3 option to scp: Copies between two remote hosts
2538 are transferred through the local host (closes: #508613).
2539 - ssh(1): "atomically" create the listening mux socket by binding it on
2540 a temporary name and then linking it into position after listen() has
2541 succeeded. This allows the mux clients to determine that the server
2542 socket is either ready or stale without races (closes: #454784).
2543 Stale server sockets are now automatically removed (closes: #523250).
2544 - ssh(1): install a SIGCHLD handler to reap expired child process
2545 (closes: #594687).
2546 - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
2547 temporary directories (closes: #357469, although only if you arrange
2548 for ssh-agent to actually see $TMPDIR since the setgid bit will cause
2549 it to be stripped off).
2550 * Update to current GSSAPI patch from
2551 http://www.sxw.org.uk/computing/patches/openssh-5.7p1-gsskex-all-20110125.patch:
2552 - Add GSSAPIServerIdentity option.
2553 * Generate ECDSA host keys on fresh installations. Upgraders who wish to
2554 add such host keys should manually add 'HostKey
2555 /etc/ssh/ssh_host_ecdsa_key' to /etc/ssh/sshd_config and run 'ssh-keygen
2556 -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa'.
2557 * Build-depend on libssl-dev (>= 0.9.8g) to ensure sufficient ECC support.
2558 * Backport SELinux build fix from CVS.
2559 * Rearrange selinux-role.patch so that it links properly given this
2560 SELinux build fix.
2561
2562 -- Colin Watson <cjwatson@debian.org> Wed, 26 Jan 2011 23:48:02 +0000
2563
2564openssh (1:5.6p1-3) experimental; urgency=low
2565
2566 * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no
2567 longer issues.
2568 * Merge 1:5.5p1-6.
2569
2570 -- Colin Watson <cjwatson@debian.org> Thu, 30 Dec 2010 11:48:00 +0000
2571
2572openssh (1:5.6p1-2) experimental; urgency=low
2573
2574 * Backport upstream patch to install a SIGCHLD handler to reap expired ssh
2575 child processes, preventing lots of zombies when using ControlPersist
2576 (closes: #594687).
2577
2578 -- Colin Watson <cjwatson@debian.org> Tue, 26 Oct 2010 14:46:40 +0100
2579
2580openssh (1:5.6p1-1) experimental; urgency=low
2581
2582 * New upstream release (http://www.openssh.com/txt/release-5.6):
2583 - Added a ControlPersist option to ssh_config(5) that automatically
2584 starts a background ssh(1) multiplex master when connecting. This
2585 connection can stay alive indefinitely, or can be set to automatically
2586 close after a user-specified duration of inactivity (closes: #335697,
2587 #350898, #454787, #500573, #550262).
2588 - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
2589 HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
2590 Match blocks (closes: #549858).
2591 - sftp(1): fix ls in working directories that contain globbing
2592 characters in their pathnames (LP: #530714).
2593
2594 -- Colin Watson <cjwatson@debian.org> Tue, 24 Aug 2010 00:37:54 +0100
2595
2596openssh (1:5.5p1-6) unstable; urgency=low
2597
2598 * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd,
2599 which is intentionally no longer shipped in the openssh-server package
2600 due to /var/run often being a temporary directory, is not removed on
2601 upgrade (closes: #575582).
2602
2603 -- Colin Watson <cjwatson@debian.org> Sun, 26 Dec 2010 18:09:29 +0000
2604
2605openssh (1:5.5p1-5) unstable; urgency=low
2606
2607 * Use an architecture wildcard for libselinux1-dev (closes: #591740).
2608 * debconf template translations:
2609 - Update Danish (thanks, Joe Hansen; closes: #592800).
2610
2611 -- Colin Watson <cjwatson@debian.org> Mon, 23 Aug 2010 22:59:03 +0100
2612
2613openssh (1:5.5p1-4) unstable; urgency=low
2614
2615 [ Sebastian Andrzej Siewior ]
2616 * Add powerpcspe to architecture list for libselinux1-dev build-dependency
2617 (closes: #579843).
2618
2619 [ Colin Watson ]
2620 * Allow ~/.ssh/authorized_keys and other secure files to be
2621 group-writable, provided that the group in question contains only the
2622 file's owner; this extends a patch previously applied to ~/.ssh/config
2623 (closes: #581919).
2624 * Check primary group memberships as well as supplementary group
2625 memberships, and only allow group-writability by groups with exactly one
2626 member, as zero-member groups are typically used by setgid binaries
2627 rather than being user-private groups (closes: #581697).
2628
2629 -- Colin Watson <cjwatson@debian.org> Sat, 22 May 2010 23:37:20 +0100
2630
2631openssh (1:5.5p1-3) unstable; urgency=low
2632
2633 * Discard error messages while checking whether rsh, rlogin, and rcp
2634 alternatives exist (closes: #579285).
2635 * Drop IDEA key check; I don't think it works properly any more due to
2636 textual changes in error output, it's only relevant for direct upgrades
2637 from truly ancient versions, and it breaks upgrades if
2638 /etc/ssh/ssh_host_key can't be loaded (closes: #579570).
2639
2640 -- Colin Watson <cjwatson@debian.org> Wed, 28 Apr 2010 22:12:47 +0100
2641
2642openssh (1:5.5p1-2) unstable; urgency=low
2643
2644 * Use dh_installinit -n, since our maintainer scripts already handle this
2645 more carefully (thanks, Julien Cristau).
2646
2647 -- Colin Watson <cjwatson@debian.org> Sat, 17 Apr 2010 12:55:56 +0100
2648
2649openssh (1:5.5p1-1) unstable; urgency=low
2650
2651 * New upstream release:
2652 - Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
2653 paths.
2654 - Include a language tag when sending a protocol 2 disconnection
2655 message.
2656 - Make logging of certificates used for user authentication more clear
2657 and consistent between CAs specified using TrustedUserCAKeys and
2658 authorized_keys.
2659
2660 -- Colin Watson <cjwatson@debian.org> Fri, 16 Apr 2010 10:27:30 +0100
2661
2662openssh (1:5.4p1-2) unstable; urgency=low
2663
2664 * Borrow patch from Fedora to add DNSSEC support: if glibc 2.11 is
2665 installed, the host key is published in an SSHFP RR secured with DNSSEC,
2666 and VerifyHostKeyDNS=yes, then ssh will no longer prompt for host key
2667 verification (closes: #572049).
2668 * Convert to dh(1), and use dh_installdocs --link-doc.
2669 * Drop lpia support, since Ubuntu no longer supports this architecture.
2670 * Use dh_install more effectively.
2671 * Add a NEWS.Debian entry about changes in smartcard support relative to
2672 previous unofficial builds (closes: #231472).
2673
2674 -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100
2675
2676openssh (1:5.4p1-1) unstable; urgency=low
2677
2678 * New upstream release (LP: #535029).
2679 - After a transition period of about 10 years, this release disables SSH
2680 protocol 1 by default. Clients and servers that need to use the
2681 legacy protocol must explicitly enable it in ssh_config / sshd_config
2682 or on the command-line.
2683 - Remove the libsectok/OpenSC-based smartcard code and add support for
2684 PKCS#11 tokens. This support is enabled by default in the Debian
2685 packaging, since it now doesn't involve additional library
2686 dependencies (closes: #231472, LP: #16918).
2687 - Add support for certificate authentication of users and hosts using a
2688 new, minimal OpenSSH certificate format (closes: #482806).
2689 - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...".
2690 - Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian
2691 package, this overlaps with the key blacklisting facility added in
2692 openssh 1:4.7p1-9, but with different file formats and slightly
2693 different scopes; for the moment, I've roughly merged the two.)
2694 - Various multiplexing improvements, including support for requesting
2695 port-forwardings via the multiplex protocol (closes: #360151).
2696 - Allow setting an explicit umask on the sftp-server(8) commandline to
2697 override whatever default the user has (closes: #496843).
2698 - Many sftp client improvements, including tab-completion, more options,
2699 and recursive transfer support for get/put (LP: #33378). The old
2700 mget/mput commands never worked properly and have been removed
2701 (closes: #270399, #428082).
2702 - Do not prompt for a passphrase if we fail to open a keyfile, and log
2703 the reason why the open failed to debug (closes: #431538).
2704 - Prevent sftp from crashing when given a "-" without a command. Also,
2705 allow whitespace to follow a "-" (closes: #531561).
2706
2707 * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some
2708 patches apply with offsets.
2709 * Include debian/ssh-askpass-gnome.png in the Debian tarball now that
2710 we're using a source format that permits this, rather than messing
2711 around with uudecode.
2712 * Drop compatibility with the old gssapi mechanism used in ssh-krb5 <<
2713 3.8.1p1-1. Simon Wilkinson refused this patch since the old gssapi
2714 mechanism was removed due to a serious security hole, and since these
2715 versions of ssh-krb5 are no longer security-supported by Debian I don't
2716 think there's any point keeping client compatibility for them.
2717 * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4.
2718 * Hardcode the location of xauth to /usr/bin/xauth rather than
2719 /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440).
2720 xauth no longer depends on x11-common, so we're no longer guaranteed to
2721 have the /usr/bin/X11 symlink available. I was taking advantage of the
2722 /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far
2723 enough in the past now that it's probably safe to just use /usr/bin.
2724 * Remove SSHD_OOM_ADJUST configuration. sshd now unconditionally makes
2725 itself non-OOM-killable, and doesn't require configuration to avoid log
2726 spam in virtualisation containers (closes: #555625).
2727 * Drop Debian-specific removal of OpenSSL version check. Upstream ignores
2728 the two patchlevel nybbles now, which is sufficient to address the
2729 original reason this change was introduced, and it appears that any
2730 change in the major/minor/fix nybbles would involve a new libssl package
2731 name. (We'd still lose if the status nybble were ever changed, but that
2732 would mean somebody had packaged a development/beta version rather than
2733 a proper release, which doesn't appear to be normal practice.)
2734 * Drop most of our "LogLevel SILENT" (-qq) patch. This was originally
2735 introduced to match the behaviour of non-free SSH, in which -q does not
2736 suppress fatal errors, but matching the behaviour of OpenSSH upstream is
2737 much more important nowadays. We no longer document that -q does not
2738 suppress fatal errors (closes: #280609). Migrate "LogLevel SILENT" to
2739 "LogLevel QUIET" in sshd_config on upgrade.
2740 * Policy version 3.8.4:
2741 - Add a Homepage field.
2742
2743 -- Colin Watson <cjwatson@debian.org> Tue, 06 Apr 2010 22:38:31 +0100
2744
2745openssh (1:5.3p1-3) unstable; urgency=low
2746
2747 * Convert to source format 3.0 (quilt).
2748 * Update README.source to match, and add a 'quilt-setup' target to
2749 debian/rules for the benefit of those checking out the package from
2750 revision control.
2751 * All patches are now maintained separately and tagged according to DEP-3.
2752 * Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump.
2753 * Remove documentation of building for Debian 3.0 in README.Debian.
2754 Support for this was removed in 1:4.7p1-2.
2755 * Remove obsolete header from README.Debian dating from when people
2756 expected non-free SSH.
2757 * Update copyright years for GSSAPI patch.
2758
2759 -- Colin Watson <cjwatson@debian.org> Sun, 28 Feb 2010 01:35:53 +0000
2760
2761openssh (1:5.3p1-2) unstable; urgency=low
2762
2763 * Link with -Wl,--as-needed (closes: #560155).
2764 * Install upstream sshd_config as an example (closes: #415008).
2765 * Use dh_lintian.
2766 * Honour DEB_BUILD_OPTIONS=nocheck.
2767
2768 -- Colin Watson <cjwatson@debian.org> Mon, 22 Feb 2010 12:43:24 +0000
2769
2770openssh (1:5.3p1-1) unstable; urgency=low
2771
2772 * New upstream release.
2773 * Update to GSSAPI patch from
2774 http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.
2775 * Backport from upstream:
2776 - Do not fall back to adding keys without constraints (ssh-add -c / -t
2777 ...) when the agent refuses the constrained add request. This was a
2778 useful migration measure back in 2002 when constraints were new, but
2779 just adds risk now (LP: #209447).
2780 * Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system
2781 calls. This only applied to Linux 2.2, which it's no longer feasible to
2782 run anyway (see 1:5.2p1-2 changelog).
2783
2784 -- Colin Watson <cjwatson@debian.org> Tue, 26 Jan 2010 11:55:29 +0000
2785
2786openssh (1:5.2p1-2) unstable; urgency=low
2787
2788 [ Colin Watson ]
2789 * Backport from upstream:
2790 - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd
2791 re-execs itself. Prevents two HUPs in quick succession from resulting
2792 in sshd dying (LP: #497781).
2793 - Output a debug if we can't open an existing keyfile (LP: #505301).
2794 * Use host compiler for ssh-askpass-gnome when cross-compiling.
2795 * Don't run tests when cross-compiling.
2796 * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file
2797 descriptor passing when running on Linux 2.0. The previous stable
2798 release of Debian dropped support for Linux 2.4, let alone 2.0, so this
2799 very likely has no remaining users depending on it.
2800
2801 [ Kees Cook ]
2802 * Implement DebianBanner server configuration flag that can be set to "no"
2803 to allow sshd to run without the Debian-specific extra version in the
2804 initial protocol handshake (closes: #562048).
2805
2806 -- Colin Watson <cjwatson@debian.org> Sat, 16 Jan 2010 01:28:58 +0000
2807
2808openssh (1:5.2p1-1) unstable; urgency=low
2809
2810 * New upstream release (closes: #536182). Yes, I know 5.3p1 has been out
2811 for a while, but there's no GSSAPI patch available for it yet.
2812 - Change the default cipher order to prefer the AES CTR modes and the
2813 revised "arcfour256" mode to CBC mode ciphers that are susceptible to
2814 CPNI-957037 "Plaintext Recovery Attack Against SSH".
2815 - Add countermeasures to mitigate CPNI-957037-style attacks against the
2816 SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid
2817 packet length or Message Authentication Code, ssh/sshd will continue
2818 reading up to the maximum supported packet length rather than
2819 immediately terminating the connection. This eliminates most of the
2820 known differences in behaviour that leaked information about the
2821 plaintext of injected data which formed the basis of this attack
2822 (closes: #506115, LP: #379329).
2823 - ForceCommand directive now accepts commandline arguments for the
2824 internal-sftp server (closes: #524423, LP: #362511).
2825 - Add AllowAgentForwarding to available Match keywords list (closes:
2826 #540623).
2827 - Make ssh(1) send the correct channel number for
2828 SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to
2829 avoid triggering 'Non-public channel' error messages on sshd(8) in
2830 openssh-5.1.
2831 - Avoid printing 'Non-public channel' warnings in sshd(8), since the
2832 ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a
2833 behaviour introduced in openssh-5.1; closes: #496017).
2834 - Disable nonfunctional ssh(1) ~C escape handler in multiplex slave
2835 connections (closes: #507541).
2836 - Fix "whitepsace" typo in ssh_config(5) (closes: #514313, LP: #303835).
2837 * Update to GSSAPI patch from
2838 http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch,
2839 including cascading credentials support (LP: #416958).
2840 * Use x11.pc when compiling/linking gnome-ssh-askpass2 (closes: #555951).
2841 * Moved to bzr.debian.org; add Vcs-Bzr and Vcs-Browser control fields.
2842 * Add debian/README.source with instructions on bzr handling.
2843 * Make ChrootDirectory work with SELinux (thanks, Russell Coker; closes:
2844 #556644).
2845 * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav Ovsík;
2846 closes: #498684).
2847 * Don't duplicate backslashes when displaying server banner (thanks,
2848 Michał Górny; closes: #505378, LP: #425346).
2849 * Use hardening-includes for hardening logic (thanks, Kees Cook; closes:
2850 #561887).
2851 * Update OpenSSH FAQ to revision 1.110.
2852 * Remove ssh/new_config, only needed for direct upgrades from potato which
2853 are no longer particularly feasible anyway (closes: #420682).
2854 * Cope with insserv reordering of init script links.
2855 * Remove init script stop link in rc1, as killprocs handles it already.
2856 * Adjust short descriptions to avoid relying on previous experience with
2857 rsh, based on suggestions from Reuben Thomas (closes: #512198).
2858 * Remove manual page references to login.conf, which aren't applicable on
2859 non-BSD systems (closes: #154434).
2860 * Remove/adjust manual page references to BSD-specific /etc/rc (closes:
2861 #513417).
2862 * Refer to sshd_config(5) rather than sshd(8) in postinst-written
2863 /etc/ssh/sshd_config, and add UsePAM commentary from upstream-shipped
2864 configuration file (closes: #415008, although unfortunately this will
2865 only be conveniently visible on new installations).
2866 * Include URL to OpenBSD's ssl(8) in ssh(1), since I don't see a better
2867 source for the same information among Debian's manual pages (closes:
2868 #530692, LP: #456660).
2869
2870 -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2010 13:23:35 +0000
2871
2872openssh (1:5.1p1-8) unstable; urgency=low
2873
2874 * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi;
2875 closes: #538313).
2876 * Build-depend on libselinux1-dev on sh4 too (thanks, Nobuhiro Iwamatsu;
2877 closes: #547103).
2878 * Fix grammar in if-up script (closes: #549128).
2879 * Pass $SSHD_OPTS when checking configuration too (thanks, "sobtwmxt";
2880 closes: #548662).
2881
2882 -- Colin Watson <cjwatson@debian.org> Mon, 05 Oct 2009 13:30:49 +0100
2883
2884openssh (1:5.1p1-7) unstable; urgency=low
2885
2886 * Update config.guess and config.sub from autotools-dev 20090611.1
2887 (closes: #538301).
2888 * Set umask to 022 in the init script as well as postinsts (closes:
2889 #539030).
2890 * Add ${misc:Depends} to keep Lintian happy.
2891 * Use 'which' rather than 'type' in maintainer scripts.
2892 * Upgrade to debhelper v7.
2893
2894 -- Colin Watson <cjwatson@debian.org> Fri, 31 Jul 2009 16:28:10 +0100
2895
2896openssh (1:5.1p1-6) unstable; urgency=low
2897
2898 * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather
2899 than O_RDWR.
2900 * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes:
2901 #511771).
2902 * Add ufw integration (thanks, Didier Roche; see
2903 https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages;
2904 LP: #261884).
2905 * Add a comment above PermitRootLogin in sshd_config pointing to
2906 README.Debian.
2907 * Check if delgroup is present in openssh-client.postrm (closes: #530501).
2908 * Build with -fPIC on mips/mipsel (thanks, Luk Claes; closes: #531942).
2909 * Remove /var/run/sshd from openssh-server package; it will be created at
2910 run-time before starting the server.
2911 * Use invoke-rc.d in openssh-server's if-up script.
2912
2913 -- Colin Watson <cjwatson@debian.org> Fri, 05 Jun 2009 11:56:03 +0100
2914
2915openssh (1:5.1p1-5) unstable; urgency=low
2916
2917 * Backport from upstream CVS (Markus Friedl):
2918 - packet_disconnect() on padding error, too. Should reduce the success
2919 probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18.
2920 * Check that /var/run/sshd.pid exists and that the process ID listed there
2921 corresponds to sshd before running '/etc/init.d/ssh reload' from if-up
2922 script; SIGHUP is racy if called at boot before sshd has a chance to
2923 install its signal handler, but fortunately the pid file is written
2924 after that which lets us avoid the race (closes: #502444).
2925 * While the above is a valuable sanity-check, it turns out that it doesn't
2926 really fix the bug (thanks to Kevin Price for testing), so for the
2927 meantime we'll just use '/etc/init.d/ssh restart', even though it is
2928 unfortunately heavyweight.
2929
2930 -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 00:34:08 +0000
2931
2932openssh (1:5.1p1-4) unstable; urgency=low
2933
2934 * ssh-copy-id: Strip trailing colons from hostname (closes: #226172,
2935 LP: #249706; thanks to Karl Goetz for nudging this along; forwarded
2936 upstream as https://bugzilla.mindrot.org/show_bug.cgi?id=1530).
2937 * Backport from upstream CVS (Markus Friedl):
2938 - Only send eow and no-more-sessions requests to openssh 5 and newer;
2939 fixes interop problems with broken ssh v2 implementations (closes:
2940 #495917).
2941 * Fix double-free when failing to parse a forwarding specification given
2942 using ~C (closes: #505330; forwarded upstream as
2943 https://bugzilla.mindrot.org/show_bug.cgi?id=1539).
2944
2945 -- Colin Watson <cjwatson@debian.org> Sun, 23 Nov 2008 14:46:10 +0000
2946
2947openssh (1:5.1p1-3) unstable; urgency=low
2948
2949 * Remove unnecessary ssh-vulnkey output in non-verbose mode when no
2950 compromised or unknown keys were found (closes: #496495).
2951 * Configure with --disable-strip; dh_strip will deal with stripping
2952 binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link;
2953 closes: #498681).
2954 * Fix handling of zero-length server banners (thanks, Tomas Mraz; closes:
2955 #497026).
2956
2957 -- Colin Watson <cjwatson@debian.org> Tue, 30 Sep 2008 23:09:58 +0100
2958
2959openssh (1:5.1p1-2) unstable; urgency=low
2960
2961 * Look for $SHELL on the path when executing ProxyCommands or
2962 LocalCommands (closes: #492728).
2963
2964 -- Colin Watson <cjwatson@debian.org> Tue, 29 Jul 2008 15:31:25 +0100
2965
2966openssh (1:5.1p1-1) unstable; urgency=low
2967
2968 * New upstream release (closes: #474301). Important changes not previously
2969 backported to 4.7p1:
2970 - 4.9/4.9p1 (http://www.openssh.com/txt/release-4.9):
2971 + Added chroot(2) support for sshd(8), controlled by a new option
2972 "ChrootDirectory" (closes: #139047, LP: #24777).
2973 + Linked sftp-server(8) into sshd(8). The internal sftp server is used
2974 when the command "internal-sftp" is specified in a Subsystem or
2975 ForceCommand declaration. When used with ChrootDirectory, the
2976 internal sftp server requires no special configuration of files
2977 inside the chroot environment.
2978 + Added a protocol extension method "posix-rename@openssh.com" for
2979 sftp-server(8) to perform POSIX atomic rename() operations; sftp(1)
2980 prefers this if available (closes: #308561).
2981 + Removed the fixed limit of 100 file handles in sftp-server(8).
2982 + ssh(8) will now skip generation of SSH protocol 1 ephemeral server
2983 keys when in inetd mode and protocol 2 connections are negotiated.
2984 This speeds up protocol 2 connections to inetd-mode servers that
2985 also allow Protocol 1.
2986 + Accept the PermitRootLogin directive in a sshd_config(5) Match
2987 block. Allows for, e.g. permitting root only from the local network.
2988 + Reworked sftp(1) argument splitting and escaping to be more
2989 internally consistent (i.e. between sftp commands) and more
2990 consistent with sh(1). Please note that this will change the
2991 interpretation of some quoted strings, especially those with
2992 embedded backslash escape sequences.
2993 + Support "Banner=none" in sshd_config(5) to disable sending of a
2994 pre-login banner (e.g. in a Match block).
2995 + ssh(1) ProxyCommands are now executed with $SHELL rather than
2996 /bin/sh.
2997 + ssh(1)'s ConnectTimeout option is now applied to both the TCP
2998 connection and the SSH banner exchange (previously it just covered
2999 the TCP connection). This allows callers of ssh(1) to better detect
3000 and deal with stuck servers that accept a TCP connection but don't
3001 progress the protocol, and also makes ConnectTimeout useful for
3002 connections via a ProxyCommand.
3003 + scp(1) incorrectly reported "stalled" on slow copies (closes:
3004 #140828).
3005 + scp(1) date underflow for timestamps before epoch.
3006 + ssh(1) used the obsolete SIG DNS RRtype for host keys in DNS,
3007 instead of the current standard RRSIG.
3008 + Correctly drain ACKs when a sftp(1) upload write fails midway,
3009 avoids a fatal() exit from what should be a recoverable condition.
3010 + Fixed ssh-keygen(1) selective host key hashing (i.e. "ssh-keygen -HF
3011 hostname") to not include any IP address in the data to be hashed.
3012 + Make ssh(1) skip listening on the IPv6 wildcard address when a
3013 binding address of 0.0.0.0 is used against an old SSH server that
3014 does not support the RFC4254 syntax for wildcard bind addresses.
3015 + Enable IPV6_V6ONLY socket option on sshd(8) listen socket, as is
3016 already done for X11/TCP forwarding sockets (closes: #439661).
3017 + Fix FD leak that could hang a ssh(1) connection multiplexing master.
3018 + Make ssh(1) -q option documentation consistent with reality.
3019 + Fixed sshd(8) PAM support not calling pam_session_close(), or
3020 failing to call it with root privileges (closes: #372680).
3021 + Fix activation of OpenSSL engine support when requested in configure
3022 (LP: #119295).
3023 + Cache SELinux status earlier so we know if it's enabled after a
3024 chroot (LP: #237557).
3025 - 5.1/5.1p1 (http://www.openssh.com/txt/release-5.1):
3026 + Introduce experimental SSH Fingerprint ASCII Visualisation to ssh(1)
3027 and ssh-keygen(1). Visual fingerprint display is controlled by a new
3028 ssh_config(5) option "VisualHostKey". The intent is to render SSH
3029 host keys in a visual form that is amenable to easy recall and
3030 rejection of changed host keys.
3031 + sshd_config(5) now supports CIDR address/masklen matching in "Match
3032 address" blocks, with a fallback to classic wildcard matching.
3033 + sshd(8) now supports CIDR matching in ~/.ssh/authorized_keys
3034 from="..." restrictions, also with a fallback to classic wildcard
3035 matching.
3036 + Added an extended test mode (-T) to sshd(8) to request that it write
3037 its effective configuration to stdout and exit. Extended test mode
3038 also supports the specification of connection parameters (username,
3039 source address and hostname) to test the application of
3040 sshd_config(5) Match rules.
3041 + ssh(1) now prints the number of bytes transferred and the overall
3042 connection throughput for SSH protocol 2 sessions when in verbose
3043 mode (previously these statistics were displayed for protocol 1
3044 connections only).
3045 + sftp-server(8) now supports extension methods statvfs@openssh.com
3046 and fstatvfs@openssh.com that implement statvfs(2)-like operations.
3047 + sftp(1) now has a "df" command to the sftp client that uses the
3048 statvfs@openssh.com to produce a df(1)-like display of filesystem
3049 space and inode utilisation (requires statvfs@openssh.com support on
3050 the server).
3051 + Added a MaxSessions option to sshd_config(5) to allow control of the
3052 number of multiplexed sessions supported over a single TCP
3053 connection. This allows increasing the number of allowed sessions
3054 above the previous default of 10, disabling connection multiplexing
3055 (MaxSessions=1) or disallowing login/shell/subsystem sessions
3056 entirely (MaxSessions=0).
3057 + Added a no-more-sessions@openssh.com global request extension that
3058 is sent from ssh(1) to sshd(8) when the client knows that it will
3059 never request another session (i.e. when session multiplexing is
3060 disabled). This allows a server to disallow further session requests
3061 and terminate the session in cases where the client has been
3062 hijacked.
3063 + ssh-keygen(1) now supports the use of the -l option in combination
3064 with -F to search for a host in ~/.ssh/known_hosts and display its
3065 fingerprint.
3066 + ssh-keyscan(1) now defaults to "rsa" (protocol 2) keys, instead of
3067 "rsa1" (LP: #129794).
3068 + Added an AllowAgentForwarding option to sshd_config(8) to control
3069 whether authentication agent forwarding is permitted. Note that this
3070 is a loose control, as a client may install their own unofficial
3071 forwarder.
3072 + ssh(1) and sshd(8): avoid unnecessary malloc/copy/free when
3073 receiving network data, resulting in a ~10% speedup.
3074 + ssh(1) and sshd(8) will now try additional addresses when connecting
3075 to a port forward destination whose DNS name resolves to more than
3076 one address. The previous behaviour was to try the only first
3077 address and give up if that failed.
3078 + ssh(1) and sshd(8) now support signalling that channels are
3079 half-closed for writing, through a channel protocol extension
3080 notification "eow@openssh.com". This allows propagation of closed
3081 file descriptors, so that commands such as "ssh -2 localhost od
3082 /bin/ls | true" do not send unnecessary data over the wire.
3083 + sshd(8): increased the default size of ssh protocol 1 ephemeral keys
3084 from 768 to 1024 bits.
3085 + When ssh(1) has been requested to fork after authentication ("ssh
3086 -f") with ExitOnForwardFailure enabled, delay the fork until after
3087 replies for any -R forwards have been seen. Allows for robust
3088 detection of -R forward failure when using -f.
3089 + "Match group" blocks in sshd_config(5) now support negation of
3090 groups. E.g. "Match group staff,!guests".
3091 + sftp(1) and sftp-server(8) now allow chmod-like operations to set
3092 set[ug]id/sticky bits.
3093 + The MaxAuthTries option is now permitted in sshd_config(5) match
3094 blocks.
3095 + Multiplexed ssh(1) sessions now support a subset of the ~ escapes
3096 that are available to a primary connection.
3097 + ssh(1) connection multiplexing will now fall back to creating a new
3098 connection in most error cases (closes: #352830).
3099 + Make ssh(1) deal more gracefully with channel requests that fail.
3100 Previously it would optimistically assume that requests would always
3101 succeed, which could cause hangs if they did not (e.g. when the
3102 server runs out of file descriptors).
3103 + ssh(1) now reports multiplexing errors via the multiplex slave's
3104 stderr where possible (subject to LogLevel in the mux master).
3105 + Fixed an UMAC alignment problem that manifested on Itanium
3106 platforms.
3107 * Remove our local version of moduli(5) now that there's one upstream.
3108 * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description.
3109 * Add lintian overrides for empty /usr/share/doc/openssh-client
3110 directories in openssh-server and ssh (necessary due to being symlink
3111 targets).
3112 * Merge from Ubuntu:
3113 - Add 'status' action to openssh-server init script, requiring lsb-base
3114 (>= 3.2-13) (thanks, Dustin Kirkland).
3115 * debconf template translations:
3116 - Update Korean (thanks, Sunjae Park; closes: #484821).
3117
3118 -- Colin Watson <cjwatson@debian.org> Fri, 25 Jul 2008 10:45:08 +0100
3119
3120openssh (1:4.7p1-13) unstable; urgency=low
3121
3122 * Add some helpful advice to the end of ssh-vulnkey's output if there are
3123 unknown or compromised keys (thanks, Dan Jacobson; closes: #483756).
3124 * Check compromised key blacklist in ssh or ssh-add, as well as in the
3125 server (LP: #232391). To override the blacklist check in ssh
3126 temporarily, use 'ssh -o UseBlacklistedKeys=yes'; there is no override
3127 for the blacklist check in ssh-add.
3128 * Add cross-references to ssh-vulnkey(1) to ssh(1), ssh-add(1),
3129 ssh-keygen(1), and sshd(8) (closes: #484451).
3130 * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999
3131 (thanks, Frans Pop).
3132 * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now
3133 takes care of that (thanks, Frans Pop; closes: #484404).
3134 * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0.
3135 * Add documentation on removing openssh-blacklist locally (see #484269).
3136 * Clarify documentation of SSHD_OOM_ADJUST, and make setting it to the
3137 empty string actually skip adjustment as intended (closes: #487325).
3138 * Remove empty /usr/share/applications directory in ssh-askpass-gnome.
3139 * debconf template translations:
3140 - Update Romanian (thanks, Cătălin Feștilă; closes: #485415).
3141
3142 -- Colin Watson <cjwatson@debian.org> Mon, 21 Jul 2008 12:18:28 +0100
3143
3144openssh (1:4.7p1-12) unstable; urgency=low
3145
3146 * Fill in CVE identifier for ssh-vulnkey bug fixed in 1:4.7p1-10.
3147 * Refactor rejection of blacklisted user keys into a single
3148 reject_blacklisted_key function in auth.c (thanks, Dmitry V. Levin).
3149 * Fix memory leak of blacklisted host keys (thanks, Dmitry V. Levin).
3150 * debconf template translations:
3151 - Update Dutch (thanks, Bart Cornelis; closes: #483004).
3152 - Update Brazilian Portuguese (thanks, Eder L. Marques; closes:
3153 #483142).
3154 - Update Slovak (thanks, Ivan Masár; closes: #483517).
3155
3156 -- Colin Watson <cjwatson@debian.org> Thu, 29 May 2008 21:41:29 +0100
3157
3158openssh (1:4.7p1-11) unstable; urgency=low
3159
3160 * Make init script depend on $syslog, and fix some other dependency
3161 glitches (thanks, Petter Reinholdtsen; closes: #481018).
3162 * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman;
3163 closes: #481151).
3164 * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik;
3165 closes: #480020).
3166 * Allow building with heimdal-dev (LP: #125805).
3167
3168 * Check RSA1 keys without the need for a separate blacklist. Thanks to
3169 Simon Tatham for the idea.
3170 * Generate two keys with the PID forced to the same value and test that
3171 they differ, to defend against recurrences of the recent Debian OpenSSL
3172 vulnerability.
3173 * Recommend openssh-blacklist from openssh-client (closes: #481187).
3174 * Recommend openssh-blacklist-extra from openssh-client and
3175 openssh-server.
3176 * Make ssh-vulnkey report the file name and line number for each key
3177 (thanks, Heiko Schlittermann and Christopher Perry; closes: #481398).
3178 * Check for blacklists in /usr/share/ssh/ as well as /etc/ssh/ (see
3179 #481283).
3180 * Log IP addresses of hosts attempting to use blacklisted keys (closes:
3181 #481721).
3182 * Incorporate various ssh-vulnkey suggestions from Hugh Daniel:
3183 - Add -v (verbose) option, and don't print output for keys that have a
3184 blacklist file but that are not listed unless in verbose mode.
3185 - Move exit status documentation to a separate section.
3186 - Document key status descriptions.
3187 - Add key type to output.
3188 - Fix error output if ssh-vulnkey fails to read key files, with the
3189 exception of host keys unless -a was given.
3190 - In verbose mode, output the name of each file examined.
3191 * Handle leading IP addresses in ssh-vulnkey input (LP: #230497).
3192 * Fix various ssh-vulnkey problems pointed out by Solar Designer:
3193 - Fix some buffer handling inconsistencies.
3194 - Use xasprintf to build user key file names, avoiding truncation
3195 problems.
3196 - Drop to the user's UID when reading user keys with -a.
3197 - Use EUID rather than UID when run with no file names and without -a.
3198 - Reword "Unknown (no blacklist information)" to "Unknown (blacklist
3199 file not installed)".
3200
3201 * Fix typo in ssh/vulnerable_host_keys message (thanks, Esko Arajärvi).
3202 * debconf template translations:
3203 - Update Finnish (thanks, Esko Arajärvi; closes: #481530).
3204 - Update French (thanks, Christian Perrier; closes: #481576).
3205 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #481591).
3206 - Update Galician (thanks, Jacobo Tarrio; closes: #481596).
3207 - Update Japanese (thanks, Kenshi Muto; closes: #481621).
3208 - Update Czech (thanks, Miroslav Kure; closes: #481624).
3209 - Update German (thanks, Helge Kreutzmann; closes: #481676).
3210 - Update Portuguese (thanks, Ricardo Silva; closes: #481781).
3211 - Update Basque (thanks, Piarres Beobide; closes: #481836).
3212 - Update Bulgarian (thanks, Damyan Ivanov; closes: #481870).
3213 - Update Vietnamese (thanks, Clytie Siddall; closes: #481876).
3214 - Update Spanish (thanks, Javier Fernandez-Sanguino Peña; closes:
3215 #482341).
3216 - Update Turkish (thanks, Mert Dirik; closes: #482548).
3217 - Update Russian (thanks, Yuri Kozlov; closes: #482887).
3218 - Update Swedish (thanks, Martin Bagge; closes: #482464).
3219 - Update Italian (thanks, Luca Monducci; closes: #482808).
3220
3221 -- Colin Watson <cjwatson@debian.org> Mon, 26 May 2008 12:21:39 +0100
3222
3223openssh (1:4.7p1-10) unstable; urgency=low
3224
3225 * Add a FILES section to ssh-vulnkey(1) (thanks, Hugh Daniel).
3226 * CVE-2008-2285: ssh-vulnkey handles options in authorized_keys
3227 (LP: #230029), and treats # as introducing a comment even if it is
3228 preceded by whitespace.
3229
3230 -- Colin Watson <cjwatson@debian.org> Wed, 14 May 2008 12:35:05 +0100
3231
3232openssh (1:4.7p1-9) unstable; urgency=critical
3233
3234 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-8.
3235 * Mitigate OpenSSL security vulnerability (CVE-2008-0166):
3236 - Add key blacklisting support. Keys listed in
3237 /etc/ssh/blacklist.TYPE-LENGTH will be rejected for authentication by
3238 sshd, unless "PermitBlacklistedKeys yes" is set in
3239 /etc/ssh/sshd_config.
3240 - Add a new program, ssh-vulnkey, which can be used to check keys
3241 against these blacklists.
3242 - Depend on openssh-blacklist.
3243 - Force dependencies on libssl0.9.8 / libcrypto0.9.8-udeb to at least
3244 0.9.8g-9.
3245 - Automatically regenerate known-compromised host keys, with a
3246 critical-priority debconf note. (I regret that there was no time to
3247 gather translations.)
3248
3249 -- Colin Watson <cjwatson@debian.org> Tue, 13 May 2008 12:33:38 +0100
3250
3251openssh (1:4.7p1-8) unstable; urgency=high
3252
3253 * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5.
3254 * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old
3255 configurations (LP: #211400).
3256 * Tweak scp's reporting of filenames in verbose mode to be a bit less
3257 confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945).
3258 * Backport from 4.9p1:
3259 - CVE-2008-1657: Ignore ~/.ssh/rc if a sshd_config ForceCommand is
3260 specified.
3261 - Add no-user-rc authorized_keys option to disable execution of
3262 ~/.ssh/rc.
3263 * Backport from Simon Wilkinson's GSSAPI key exchange patch for 5.0p1:
3264 - Add code to actually implement GSSAPIStrictAcceptorCheck, which had
3265 somehow been omitted from a previous version of this patch (closes:
3266 #474246).
3267
3268 -- Colin Watson <cjwatson@debian.org> Sun, 06 Apr 2008 12:34:19 +0100
3269
3270openssh (1:4.7p1-7) unstable; urgency=low
3271
3272 * Ignore errors writing to oom_adj (closes: #473573).
3273
3274 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2008 16:24:44 +0100
3275
3276openssh (1:4.7p1-6) unstable; urgency=low
3277
3278 * Disable the Linux kernel's OOM-killer for the sshd parent; tweak
3279 SSHD_OOM_ADJUST in /etc/default/ssh to change this (closes: #341767).
3280
3281 -- Colin Watson <cjwatson@debian.org> Sun, 30 Mar 2008 21:14:12 +0100
3282
3283openssh (1:4.7p1-5) unstable; urgency=low
3284
3285 * Recommends: xauth rather than Suggests: xbase-clients.
3286 * Document in ssh(1) that '-S none' disables connection sharing
3287 (closes: #471437).
3288 * Patch from Red Hat / Fedora:
3289 - CVE-2008-1483: Don't use X11 forwarding port which can't be bound on
3290 all address families, preventing hijacking of X11 forwarding by
3291 unprivileged users when both IPv4 and IPv6 are configured (closes:
3292 #463011).
3293 * Use printf rather than echo -en (a bashism) in openssh-server.config and
3294 openssh-server.preinst.
3295 * debconf template translations:
3296 - Update Finnish (thanks, Esko Arajärvi; closes: #468563).
3297
3298 -- Colin Watson <cjwatson@debian.org> Sat, 22 Mar 2008 12:37:00 +0000
3299
3300openssh (1:4.7p1-4) unstable; urgency=low
3301
3302 [ Caleb Case ]
3303 * Fix configure detection of getseuserbyname and
3304 get_default_context_with_level (closes: #465614, LP: #188136).
3305
3306 [ Colin Watson ]
3307 * Include the autogenerated debian/copyright in the source package.
3308 * Move /etc/pam.d/ssh to /etc/pam.d/sshd, allowing us to stop defining
3309 SSHD_PAM_SERVICE (closes: #255870).
3310
3311 -- Colin Watson <cjwatson@debian.org> Wed, 13 Feb 2008 18:18:52 +0000
3312
3313openssh (1:4.7p1-3) unstable; urgency=low
3314
3315 * Improve grammar of ssh-askpass-gnome description.
3316 * Backport from upstream:
3317 - Use the correct packet maximum sizes for remote port and agent
3318 forwarding. Prevents the server from killing the connection if too
3319 much data is queued and an excessively large packet gets sent
3320 (https://bugzilla.mindrot.org/show_bug.cgi?id=1360).
3321 * Allow passing temporary daemon parameters on the init script's command
3322 line, e.g. '/etc/init.d/ssh start "-o PermitRootLogin=yes"' (thanks,
3323 Marc Haber; closes: #458547).
3324
3325 -- Colin Watson <cjwatson@debian.org> Fri, 01 Feb 2008 21:59:59 +0000
3326
3327openssh (1:4.7p1-2) unstable; urgency=low
3328
3329 * Adjust many relative links in faq.html to point to
3330 http://www.openssh.com/ (thanks, Dan Jacobson; mentioned in #459807).
3331 * Pass --with-mantype=doc to configure rather than build-depending on
3332 groff (closes: #460121).
3333 * Add armel to architecture list for libselinux1-dev build-dependency
3334 (closes: #460136).
3335 * Drop source-compatibility with Debian 3.0:
3336 - Remove support for building with GNOME 1. This allows simplification
3337 of our GNOME build-dependencies (see #460136).
3338 - Remove hacks to support the old PAM configuration scheme.
3339 - Remove compatibility for building without po-debconf.
3340 * Build-depend on libgtk2.0-dev rather than libgnomeui-dev. As far as I
3341 can see, the GTK2 version of ssh-askpass-gnome has never required
3342 libgnomeui-dev.
3343
3344 -- Colin Watson <cjwatson@debian.org> Fri, 11 Jan 2008 00:14:10 +0000
3345
3346openssh (1:4.7p1-1) unstable; urgency=low
3347
3348 * New upstream release (closes: #453367).
3349 - CVE-2007-4752: Prevent ssh(1) from using a trusted X11 cookie if
3350 creation of an untrusted cookie fails; found and fixed by Jan Pechanec
3351 (closes: #444738).
3352 - sshd(8) in new installations defaults to SSH Protocol 2 only. Existing
3353 installations are unchanged.
3354 - The SSH channel window size has been increased, and both ssh(1)
3355 sshd(8) now send window updates more aggressively. These improves
3356 performance on high-BDP (Bandwidth Delay Product) networks.
3357 - ssh(1) and sshd(8) now preserve MAC contexts between packets, which
3358 saves 2 hash calls per packet and results in 12-16% speedup for
3359 arcfour256/hmac-md5.
3360 - A new MAC algorithm has been added, UMAC-64 (RFC4418) as
3361 "umac-64@openssh.com". UMAC-64 has been measured to be approximately
3362 20% faster than HMAC-MD5.
3363 - Failure to establish a ssh(1) TunnelForward is now treated as a fatal
3364 error when the ExitOnForwardFailure option is set.
3365 - ssh(1) returns a sensible exit status if the control master goes away
3366 without passing the full exit status.
3367 - When using a ProxyCommand in ssh(1), set the outgoing hostname with
3368 gethostname(2), allowing hostbased authentication to work.
3369 - Make scp(1) skip FIFOs rather than hanging (closes: #246774).
3370 - Encode non-printing characters in scp(1) filenames. These could cause
3371 copies to be aborted with a "protocol error".
3372 - Handle SIGINT in sshd(8) privilege separation child process to ensure
3373 that wtmp and lastlog records are correctly updated.
3374 - Report GSSAPI mechanism in errors, for libraries that support multiple
3375 mechanisms.
3376 - Improve documentation for ssh-add(1)'s -d option.
3377 - Rearrange and tidy GSSAPI code, removing server-only code being linked
3378 into the client.
3379 - Delay execution of ssh(1)'s LocalCommand until after all forwardings
3380 have been established.
3381 - In scp(1), do not truncate non-regular files.
3382 - Improve exit message from ControlMaster clients.
3383 - Prevent sftp-server(8) from reading until it runs out of buffer space,
3384 whereupon it would exit with a fatal error (closes: #365541).
3385 - pam_end() was not being called if authentication failed
3386 (closes: #405041).
3387 - Manual page datestamps updated (closes: #433181).
3388 * Install the OpenSSH FAQ in /usr/share/doc/openssh-client.
3389 - Includes documentation on copying files with colons using scp
3390 (closes: #303453).
3391 * Create /var/run/sshd on start even if /etc/ssh/sshd_not_to_be_run exists
3392 (closes: #453285).
3393 * Fix "overriden" typo in ssh(1) (thanks, A. Costa; closes: #390699).
3394 * Refactor debian/rules configure and make invocations to make development
3395 easier.
3396 * Remove the hideously old /etc/ssh/primes on upgrade (closes: #123013).
3397 * Update moduli(5) to revision 1.11 from OpenBSD CVS.
3398 * Document the non-default options we set as standard in ssh_config(5) and
3399 sshd_config(5) (closes: #327886, #345628).
3400 * Recode LICENCE to UTF-8 when concatenating it to debian/copyright.
3401 * Override desktop-file-but-no-dh_desktop-call lintian warning; the
3402 .desktop file is intentionally not installed (see 1:3.8.1p1-10).
3403 * Update copyright dates for Kerberos patch in debian/copyright.head.
3404 * Policy version 3.7.3: no changes required.
3405
3406 -- Colin Watson <cjwatson@debian.org> Mon, 24 Dec 2007 16:43:02 +0000
3407
3408openssh (1:4.6p1-7) unstable; urgency=low
3409
3410 * Don't build PIE executables on m68k (closes: #451192).
3411 * Use autotools-dev's recommended configure --build and --host options.
3412 * Adjust README.Debian to suggest mailing debian-ssh@lists.debian.org
3413 rather than Matthew.
3414 * Check whether deluser exists in postrm (closes: #454085).
3415
3416 -- Colin Watson <cjwatson@debian.org> Mon, 03 Dec 2007 11:11:02 +0000
3417
3418openssh (1:4.6p1-6) unstable; urgency=low
3419
3420 * Remove blank line between head comment and first template in
3421 debian/openssh-server.templates.master; apparently it confuses some
3422 versions of debconf.
3423 * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas
3424 Pospisek; closes: #441817).
3425 * Discard error output from dpkg-query in preinsts, in case the ssh
3426 metapackage is not installed.
3427 * Fix sshd/inittab advice in README.Debian to account for rc.d movement
3428 (closes: #450632).
3429 * Suppress error from debian/rules if lsb-release is not installed.
3430 * Don't ignore errors from 'make -C contrib clean'.
3431 * Adjust categories in ssh-askpass-gnome.desktop to comply with the
3432 Desktop Menu Specification.
3433 * debconf template translations:
3434 - Add Slovak (thanks, Ivan Masár; closes: #441690).
3435 - Update Brazilian Portuguese (thanks, Eder L. Marques;
3436 closes: #447145).
3437
3438 -- Colin Watson <cjwatson@debian.org> Mon, 12 Nov 2007 11:47:28 +0000
3439
3440openssh (1:4.6p1-5) unstable; urgency=low
3441
3442 * Identify ssh as a metapackage rather than a transitional package. It's
3443 still useful as a quick way to install both the client and the server.
3444 * ssh-copy-id now checks the exit status of ssh-add -L (thanks, Adeodato
3445 Simó; closes: #221675).
3446 * ssh-copy-id no longer prints the output of expr (thanks, Peter
3447 Eisentraut; closes: #291534).
3448 * ssh-copy-id defaults to ~/.ssh/id_rsa.pub rather than
3449 ~/.ssh/identity.pub, in line with ssh-keygen (thanks, Greg Norris;
3450 closes: #234627).
3451 * Build-depend on libselinux1-dev on lpia.
3452 * openssh-client Suggests: keychain.
3453 * debconf template translations:
3454 - Update Catalan (thanks, Jordà Polo; closes: #431970).
3455
3456 -- Colin Watson <cjwatson@debian.org> Mon, 30 Jul 2007 09:34:38 +0100
3457
3458openssh (1:4.6p1-4) unstable; urgency=low
3459
3460 * Don't build PIE executables on hppa, as they crash.
3461
3462 -- Colin Watson <cjwatson@debian.org> Thu, 05 Jul 2007 11:06:54 +0100
3463
3464openssh (1:4.6p1-3) unstable; urgency=low
3465
3466 * Only build PIE executables on Linux and NetBSD (closes: #430455).
3467 * Fix broken switch fallthrough when SELinux is running in permissive mode
3468 (closes: #430838).
3469 * Document that HashKnownHosts may break tab-completion (closes: #430154).
3470
3471 -- Colin Watson <cjwatson@debian.org> Fri, 29 Jun 2007 07:15:38 +0100
3472
3473openssh (1:4.6p1-2) unstable; urgency=low
3474
3475 * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL.
3476 * Clarify that 'ssh -q -q' still prints errors caused by bad arguments
3477 (i.e. before the logging system is initialised).
3478 * Suppress "Connection to <host> closed" and "Connection to master closed"
3479 messages at loglevel SILENT (thanks, Jaap Eldering; closes: #409788).
3480 * Suppress "Pseudo-terminal will not be allocated because stdin is not a
3481 terminal" message at loglevels QUIET and SILENT (closes: #366814).
3482 * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and
3483 sshd_config(5).
3484 * Add try-restart action to init script.
3485 * Add /etc/network/if-up.d/openssh-server to restart sshd when new
3486 interfaces appear (LP: #103436).
3487 * Backport from upstream:
3488 - Move C/R -> kbdint special case to after the defaults have been
3489 loaded, which makes ChallengeResponse default to yes again. This was
3490 broken by the Match changes and not fixed properly subsequently
3491 (closes: #428968).
3492 - Silence spurious error messages from hang-on-exit fix
3493 (http://bugzilla.mindrot.org/show_bug.cgi?id=1306, closes: #429531).
3494
3495 -- Colin Watson <cjwatson@debian.org> Wed, 20 Jun 2007 11:52:44 +0100
3496
3497openssh (1:4.6p1-1) unstable; urgency=low
3498
3499 * New upstream release (closes: #395507, #397961, #420035). Important
3500 changes not previously backported to 4.3p2:
3501 - 4.4/4.4p1 (http://www.openssh.com/txt/release-4.4):
3502 + On portable OpenSSH, fix a GSSAPI authentication abort that could be
3503 used to determine the validity of usernames on some platforms.
3504 + Implemented conditional configuration in sshd_config(5) using the
3505 "Match" directive. This allows some configuration options to be
3506 selectively overridden if specific criteria (based on user, group,
3507 hostname and/or address) are met. So far a useful subset of
3508 post-authentication options are supported and more are expected to
3509 be added in future releases.
3510 + Add support for Diffie-Hellman group exchange key agreement with a
3511 final hash of SHA256.
3512 + Added a "ForceCommand" directive to sshd_config(5). Similar to the
3513 command="..." option accepted in ~/.ssh/authorized_keys, this forces
3514 the execution of the specified command regardless of what the user
3515 requested. This is very useful in conjunction with the new "Match"
3516 option.
3517 + Add a "PermitOpen" directive to sshd_config(5). This mirrors the
3518 permitopen="..." authorized_keys option, allowing fine-grained
3519 control over the port-forwardings that a user is allowed to
3520 establish.
3521 + Add optional logging of transactions to sftp-server(8).
3522 + ssh(1) will now record port numbers for hosts stored in
3523 ~/.ssh/known_hosts when a non-standard port has been requested
3524 (closes: #50612).
3525 + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
3526 non-zero exit code) when requested port forwardings could not be
3527 established.
3528 + Extend sshd_config(5) "SubSystem" declarations to allow the
3529 specification of command-line arguments.
3530 + Replacement of all integer overflow susceptible invocations of
3531 malloc(3) and realloc(3) with overflow-checking equivalents.
3532 + Many manpage fixes and improvements.
3533 + Add optional support for OpenSSL hardware accelerators (engines),
3534 enabled using the --with-ssl-engine configure option.
3535 + Tokens in configuration files may be double-quoted in order to
3536 contain spaces (closes: #319639).
3537 + Move a debug() call out of a SIGCHLD handler, fixing a hang when the
3538 session exits very quickly (closes: #307890).
3539 + Fix some incorrect buffer allocation calculations (closes: #410599).
3540 + ssh-add doesn't ask for a passphrase if key file permissions are too
3541 liberal (closes: #103677).
3542 + Likewise, ssh doesn't ask either (closes: #99675).
3543 - 4.6/4.6p1 (http://www.openssh.com/txt/release-4.6):
3544 + sshd now allows the enabling and disabling of authentication methods
3545 on a per user, group, host and network basis via the Match directive
3546 in sshd_config.
3547 + Fixed an inconsistent check for a terminal when displaying scp
3548 progress meter (closes: #257524).
3549 + Fix "hang on exit" when background processes are running at the time
3550 of exit on a ttyful/login session (closes: #88337).
3551 * Update to current GSSAPI patch from
3552 http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
3553 install ChangeLog.gssapi.
3554 * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295).
3555 * Use LSB functions in init scripts, and add an LSB-style header (partly
3556 from Ubuntu and partly thanks to Christian Perrier; closes: #389038).
3557 * Move init script start links to S16, move rc1 stop link to K84, and
3558 remove rc0 and rc6 stop links altogether (the last part from Ubuntu;
3559 closes: #122188).
3560 * Emit a slightly more informative message from the init script if
3561 /dev/null has somehow become not a character device (closes: #369964).
3562 * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447).
3563 * Merge from Ubuntu:
3564 - Build position-independent executables (only for debs, not for udebs)
3565 to take advantage of address space layout randomisation.
3566 - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to
3567 the default path.
3568 * Use ${binary:Version} rather than ${Source-Version} in openssh-server ->
3569 openssh-client dependency.
3570
3571 -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:28:26 +0100
3572
3573openssh (1:4.3p2-11) unstable; urgency=low
3574
3575 * It's been four and a half years now since I took over as "temporary"
3576 maintainer, so the Maintainer field is getting a bit inaccurate. Set
3577 Maintainer to debian-ssh@lists.debian.org and leave Matthew and myself
3578 as Uploaders.
3579 * Use dpkg-query to fetch conffile md5sums rather than parsing
3580 /var/lib/dpkg/status directly.
3581 * openssh-client Suggests: libpam-ssh (closes: #427840).
3582 * Use 'start-stop-daemon --oknodo' so that openssh-server's init script
3583 exits successfully if sshd is already running (closes: #426858).
3584
3585 * Apply results of debconf templates and package descriptions review by
3586 debian-l10n-english (closes: #420107, #420742).
3587 * debconf template translations:
3588 - Update Dutch (thanks, Machteld de Kok; closes: #419260).
3589 - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #420630).
3590 - Update Galician (thanks, Jacobo Tarrio; closes: #420635).
3591 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
3592 closes: #420651).
3593 - Update Swedish (thanks, Daniel Nylander; closes: #420663).
3594 - Add Bulgarian (thanks, Damyan Ivanov; closes: #420703).
3595 - Add Tamil (thanks, Tirumurti Vasudevan; closes: #420739).
3596 - Update German (thanks, Helge Kreutzmann; closes: #420743).
3597 - Update Japanese (thanks, Kenshi Muto; closes: #420946).
3598 - Add Basque (thanks, Piarres Beobide; closes: #421238).
3599 - Update Italian (thanks, Luca Monducci; closes: #421348).
3600 - Update Czech (thanks, Miroslav Kure; closes: #421484).
3601 - Update Romanian (thanks, Igor Stirbu; closes: #421760).
3602 - Update Russian (thanks, Yuriy Talakan' and Sergey Alyoshin;
3603 closes: #420862).
3604 - Update Dutch (thanks, Bart Cornelis; closes: #422767).
3605 - Update Portuguese (thanks, Ricardo Silva; closes: #423112).
3606 - Update French (thanks, Christian Perrier).
3607 - Add Korean (thanks, Sunjae Park; closes: #424008).
3608 - Update Vietnamese (thanks, Clytie Siddall; closes: #426991).
3609
3610 -- Colin Watson <cjwatson@debian.org> Sun, 10 Jun 2007 08:59:42 +0100
3611
3612openssh (1:4.3p2-10) unstable; urgency=low
3613
3614 * Multiply openssh-client-udeb's Installer-Menu-Item by 100.
3615 * Increase MAX_SESSIONS to 64.
3616
3617 -- Colin Watson <cjwatson@debian.org> Tue, 10 Apr 2007 19:17:20 +0100
3618
3619openssh (1:4.3p2-9) unstable; urgency=high
3620
3621 [ Russ Allbery ]
3622 * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5
3623 (closes: #404863).
3624 * Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766).
3625
3626 [ Colin Watson ]
3627 * debconf template translations:
3628 - Add Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #412330).
3629
3630 -- Colin Watson <cjwatson@debian.org> Mon, 5 Mar 2007 16:13:50 +0000
3631
3632openssh (1:4.3p2-8) unstable; urgency=medium
3633
3634 [ Vincent Untz ]
3635 * Give the ssh-askpass-gnome window a default icon; remove unnecessary
3636 icon extension from .desktop file (closes:
3637 https://launchpad.net/bugs/27152).
3638
3639 [ Colin Watson ]
3640 * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't
3641 sufficient to replace conffiles (closes: #402804).
3642 * Make GSSAPICleanupCreds a compatibility alias for
3643 GSSAPICleanupCredentials. Mark GSSUseSessionCCache and
3644 GSSAPIUseSessionCredCache as known-but-unsupported options, and migrate
3645 away from them on upgrade.
3646 * It turns out that the people who told me that removing a conffile in the
3647 preinst was sufficient to have dpkg replace it without prompting when
3648 moving a conffile between packages were very much mistaken. As far as I
3649 can tell, the only way to do this reliably is to write out the desired
3650 new text of the conffile in the preinst. This is gross, and requires
3651 shipping the text of all conffiles in the preinst too, but there's
3652 nothing for it. Fortunately this nonsense is only required for smooth
3653 upgrades from sarge.
3654 * debconf template translations:
3655 - Add Romanian (thanks, Stan Ioan-Eugen; closes: #403528).
3656
3657 -- Colin Watson <cjwatson@debian.org> Sat, 23 Dec 2006 18:38:33 +0000
3658
3659openssh (1:4.3p2-7) unstable; urgency=medium
3660
3661 [ Colin Watson ]
3662 * Ignore errors from usermod when changing sshd's shell, since it will
3663 fail if the sshd user is not local (closes: #398436).
3664 * Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config
3665 to avoid unnecessary conffile resolution steps for administrators
3666 (thanks, Jari Aalto; closes: #335259).
3667 * Fix quoting error in configure.ac and regenerate configure (thanks, Ben
3668 Pfaff; closes: #391248).
3669 * When installing openssh-client or openssh-server from scratch, remove
3670 any unchanged conffiles from the pre-split ssh package to work around a
3671 bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276).
3672
3673 [ Russ Allbery ]
3674 * Create transitional ssh-krb5 package which enables GSSAPI configuration
3675 in sshd_config (closes: #390986).
3676 * Default client to attempting GSSAPI authentication.
3677 * Remove obsolete GSSAPINoMICAuthentication from sshd_config if it's
3678 found.
3679 * Add ssh -K option, the converse of -k, to enable GSSAPI credential
3680 delegation (closes: #401483).
3681
3682 -- Colin Watson <cjwatson@debian.org> Wed, 6 Dec 2006 23:00:49 +0000
3683
3684openssh (1:4.3p2-6) unstable; urgency=low
3685
3686 * Acknowledge NMU (thanks, Manoj; closes: #394795).
3687 * Backport from 4.5p1:
3688 - Fix a bug in the sshd privilege separation monitor that weakened its
3689 verification of successful authentication. This bug is not known to be
3690 exploitable in the absence of additional vulnerabilities.
3691 * openssh-server Suggests: molly-guard (closes: #395473).
3692 * debconf template translations:
3693 - Update German (thanks, Helge Kreutzmann; closes: #395947).
3694
3695 -- Colin Watson <cjwatson@debian.org> Wed, 15 Nov 2006 00:07:32 +0000
3696
3697openssh (1:4.3p2-5.1) unstable; urgency=low
3698
3699 * NMU to update SELinux patch, bringing it in line with current selinux
3700 releases. The patch for this NMU is simply the Bug#394795 patch,
3701 and no other changes. (closes: #394795)
3702
3703 -- Manoj Srivastava <srivasta@debian.org> Mon, 23 Oct 2006 14:11:24 -0500
3704
3705openssh (1:4.3p2-5) unstable; urgency=low
3706
3707 * Remove ssh/insecure_telnetd check altogether (closes: #391081).
3708 * debconf template translations:
3709 - Update Danish (thanks, Claus Hindsgaul; closes: #390612).
3710
3711 -- Colin Watson <cjwatson@debian.org> Thu, 5 Oct 2006 09:04:19 +0100
3712
3713openssh (1:4.3p2-4) unstable; urgency=high
3714
3715 * Backport from 4.4p1 (since I don't have an updated version of the GSSAPI
3716 patch yet):
3717 - CVE-2006-4924: Fix a pre-authentication denial of service found by
3718 Tavis Ormandy, that would cause sshd(8) to spin until the login grace
3719 time expired (closes: #389995).
3720 - CVE-2006-5051: Fix an unsafe signal hander reported by Mark Dowd. The
3721 signal handler was vulnerable to a race condition that could be
3722 exploited to perform a pre-authentication denial of service. On
3723 portable OpenSSH, this vulnerability could theoretically lead to
3724 pre-authentication remote code execution if GSSAPI authentication is
3725 enabled, but the likelihood of successful exploitation appears remote.
3726
3727 * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël
3728 Hertzog; closes: #369395).
3729 * Remove no-longer-used ssh/insecure_rshd debconf template.
3730 * Make ssh/insecure_telnetd Type: error (closes: #388946).
3731
3732 * debconf template translations:
3733 - Update Portuguese (thanks, Rui Branco; closes: #381942).
3734 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
3735 closes: #382966).
3736
3737 -- Colin Watson <cjwatson@debian.org> Fri, 29 Sep 2006 16:28:24 +0100
3738
3739openssh (1:4.3p2-3) unstable; urgency=low
3740
3741 * Document KeepAlive->TCPKeepAlive renaming in sshd_config(5) (closes:
3742 https://launchpad.net/bugs/50702).
3743 * Change sshd user's shell to /usr/sbin/nologin (closes: #366541).
3744 Introduces dependency on passwd for usermod.
3745 * debconf template translations:
3746 - Update French (thanks, Denis Barbier; closes: #368503).
3747 - Update Dutch (thanks, Bart Cornelis; closes: #375100).
3748 - Update Japanese (thanks, Kenshi Muto; closes: #379950).
3749
3750 -- Colin Watson <cjwatson@debian.org> Thu, 27 Jul 2006 00:12:36 +0100
3751
3752openssh (1:4.3p2-2) unstable; urgency=low
3753
3754 * Include commented-out pam_access example in /etc/pam.d/ssh.
3755 * On '/etc/init.d/ssh restart', create /var/run/sshd before checking the
3756 server configuration, as otherwise 'sshd -t' will complain about the
3757 lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234).
3758 * debconf template translations:
3759 - Update Russian (thanks, Yuriy Talakan'; closes: #367143).
3760 - Update Czech (thanks, Miroslav Kure; closes: #367161).
3761 - Update Italian (thanks, Luca Monducci; closes: #367186).
3762 - Update Galician (thanks, Jacobo Tarrio; closes: #367318).
3763 - Update Swedish (thanks, Daniel Nylander; closes: #367971).
3764
3765 -- Colin Watson <cjwatson@debian.org> Fri, 19 May 2006 09:14:27 +0100
3766
3767openssh (1:4.3p2-1) unstable; urgency=low
3768
3769 * New upstream release (closes: #361032).
3770 - CVE-2006-0225: scp (as does rcp, on which it is based) invoked a
3771 subshell to perform local to local, and remote to remote copy
3772 operations. This subshell exposed filenames to shell expansion twice;
3773 allowing a local attacker to create filenames containing shell
3774 metacharacters that, if matched by a wildcard, could lead to execution
3775 of attacker-specified commands with the privilege of the user running
3776 scp (closes: #349645).
3777 - Add support for tunneling arbitrary network packets over a connection
3778 between an OpenSSH client and server via tun(4) virtual network
3779 interfaces. This allows the use of OpenSSH (4.3+) to create a true VPN
3780 between the client and server providing real network connectivity at
3781 layer 2 or 3. This feature is experimental.
3782 - Reduce default key length for new DSA keys generated by ssh-keygen
3783 back to 1024 bits. DSA is not specified for longer lengths and does
3784 not fully benefit from simply making keys longer. As per FIPS 186-2
3785 Change Notice 1, ssh-keygen will refuse to generate a new DSA key
3786 smaller or larger than 1024 bits.
3787 - Fixed X forwarding failing to start when the X11 client is executed in
3788 background at the time of session exit.
3789 - Change ssh-keygen to generate a protocol 2 RSA key when invoked
3790 without arguments (closes: #114894).
3791 - Fix timing variance for valid vs. invalid accounts when attempting
3792 Kerberos authentication.
3793 - Ensure that ssh always returns code 255 on internal error
3794 (closes: #259865).
3795 - Cleanup wtmp files on SIGTERM when not using privsep.
3796 - Set SO_REUSEADDR on X11 listeners to avoid problems caused by
3797 lingering sockets from previous session (X11 applications can
3798 sometimes not connect to 127.0.0.1:60xx) (closes:
3799 https://launchpad.net/bugs/25528).
3800 - Ensure that fds 0, 1 and 2 are always attached in all programs, by
3801 duping /dev/null to them if necessary.
3802 - Xauth list invocation had bogus "." argument.
3803 - Remove internal assumptions on key exchange hash algorithm and output
3804 length, preparing OpenSSH for KEX methods with alternate hashes.
3805 - Ignore junk sent by a server before it sends the "SSH-" banner.
3806 - Many manual page improvements.
3807 - Lots of cleanups, including fixes to memory leaks on error paths and
3808 possible crashes.
3809 * Update to current GSSAPI patch from
3810 http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch
3811 (closes: #352042).
3812 * debian/rules: Resynchronise CFLAGS with that generated by configure.
3813 * Restore pam_nologin to /etc/pam.d/ssh; sshd no longer checks this itself
3814 when PAM is enabled, but relies on PAM to do it.
3815 * Rename KeepAlive to TCPKeepAlive in default sshd_config
3816 (closes: #349896).
3817 * Rephrase ssh/new_config and ssh/encrypted_host_key_but_no_keygen debconf
3818 templates to make boolean short descriptions end with a question mark
3819 and to avoid use of the first person.
3820 * Ship README.tun.
3821 * Policy version 3.7.2: no changes required.
3822 * debconf template translations:
3823 - Update Italian (thanks, Luca Monducci; closes: #360348).
3824 - Add Galician (thanks, Jacobo Tarrio; closes: #361220).
3825
3826 -- Colin Watson <cjwatson@debian.org> Fri, 12 May 2006 12:48:24 +0100
3827
3828openssh (1:4.2p1-8) unstable; urgency=low
3829
3830 [ Frans Pop ]
3831 * Use udeb support introduced in debhelper 4.2.0 (available in sarge)
3832 rather than constructing udebs by steam.
3833 * Require debhelper 5.0.22, which generates correct shared library
3834 dependencies for udebs (closes: #360068). This build-dependency can be
3835 ignored if building on sarge.
3836
3837 [ Colin Watson ]
3838 * Switch to debhelper compatibility level 4, since we now require
3839 debhelper 4 even on sarge anyway for udeb support.
3840
3841 -- Colin Watson <cjwatson@debian.org> Fri, 31 Mar 2006 09:44:55 +0100
3842
3843openssh (1:4.2p1-7) unstable; urgency=low
3844
3845 * I accidentally applied the default $PATH change in 1:4.2p1-6 to the udeb
3846 rather than the deb. Fixed.
3847
3848 -- Colin Watson <cjwatson@debian.org> Wed, 1 Mar 2006 16:19:00 +0000
3849
3850openssh (1:4.2p1-6) unstable; urgency=low
3851
3852 * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11
3853 to the normal and superuser paths and /usr/games to the normal path.
3854 * When the client receives a signal, don't fatal() with "Killed by signal
3855 %d." (which produces unhelpful noise on stderr and causes confusion for
3856 users of some applications that wrap ssh); instead, generate a debug
3857 message and exit with the traditional status (closes: #313371).
3858 * debconf template translations:
3859 - Add Swedish (thanks, Daniel Nylander; closes: #333133).
3860 - Update Spanish (thanks, Javier Fernández-Sanguino Peña;
3861 closes: #341371).
3862 - Correct erroneously-changed Last-Translator headers in Greek and
3863 Spanish translations.
3864
3865 -- Colin Watson <cjwatson@debian.org> Mon, 20 Feb 2006 16:50:55 +0000
3866
3867openssh (1:4.2p1-5) unstable; urgency=low
3868
3869 * Add a CVE name to the 1:4.0p1-1 changelog entry.
3870 * Build-depend on libselinux1-dev on armeb.
3871 * Only send GSSAPI proposal if GSSAPIAuthentication is enabled.
3872 * Build-depend on libssl-dev (>= 0.9.8-1) to cope with surprise OpenSSL
3873 transition, since otherwise who knows what the buildds will do. If
3874 you're building openssh yourself, you can safely ignore this and use an
3875 older libssl-dev.
3876
3877 -- Colin Watson <cjwatson@debian.org> Fri, 7 Oct 2005 12:23:42 +0100
3878
3879openssh (1:4.2p1-4) unstable; urgency=low
3880
3881 * Initialise token to GSS_C_EMPTY_BUFFER in ssh_gssapi_check_mechanism
3882 (closes: #328606).
3883
3884 -- Colin Watson <cjwatson@debian.org> Fri, 16 Sep 2005 12:50:16 +0100
3885
3886openssh (1:4.2p1-3) unstable; urgency=low
3887
3888 * Add prototype for ssh_gssapi_server_mechanisms (closes: #328372).
3889 * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly
3890 different version of the gssapi authentication method (thanks, Aaron M.
3891 Ucko; closes: #328388).
3892 * Explicitly tell po2debconf to use the 'popular' output encoding, so that
3893 the woody-compatibility hack works even with po-debconf 0.9.0.
3894
3895 -- Colin Watson <cjwatson@debian.org> Thu, 15 Sep 2005 09:28:21 +0100
3896
3897openssh (1:4.2p1-2) unstable; urgency=low
3898
3899 * Annotate 1:4.2p1-1 changelog with CVE references.
3900 * Add remaining pieces of Kerberos support (closes: #152657, #275472):
3901 - Add GSSAPI key exchange support from
3902 http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen
3903 Frost).
3904 - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr.
3905 - openssh-client and openssh-server replace ssh-krb5.
3906 - Update commented-out Kerberos/GSSAPI options in default sshd_config.
3907 - Fix HAVE_GSSAPI_KRB5_H/HAVE_GSSAPI_GSSAPI_KRB5_H typos in
3908 gss-serv-krb5.c.
3909
3910 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 18:28:49 +0100
3911
3912openssh (1:4.2p1-1) unstable; urgency=low
3913
3914 * New upstream release.
3915 - SECURITY (CAN-2005-2797): Fix a bug introduced in OpenSSH 4.0 that
3916 caused GatewayPorts to be incorrectly activated for dynamic ("-D")
3917 port forwardings when no listen address was explicitly specified
3918 (closes: #326065).
3919 - SECURITY (CAN-2005-2798): Fix improper delegation of GSSAPI
3920 credentials. This code is only built in openssh-krb5, not openssh, but
3921 I mention the CVE reference here anyway for completeness.
3922 - Add a new compression method ("Compression delayed") that delays zlib
3923 compression until after authentication, eliminating the risk of zlib
3924 vulnerabilities being exploited by unauthenticated users. Note that
3925 users of OpenSSH versions earlier than 3.5 will need to disable
3926 compression on the client or set "Compression yes" (losing this
3927 security benefit) on the server.
3928 - Increase the default size of new RSA/DSA keys generated by ssh-keygen
3929 from 1024 to 2048 bits (closes: #181162).
3930 - Many bugfixes and improvements to connection multiplexing.
3931 - Don't pretend to accept $HOME (closes: #208648).
3932 * debian/rules: Resynchronise CFLAGS with that generated by configure.
3933 * openssh-client and openssh-server conflict with pre-split ssh to avoid
3934 problems when ssh is left un-upgraded (closes: #324695).
3935 * Set X11Forwarding to yes in the default sshd_config (new installs only).
3936 At least when X11UseLocalhost is turned on, which is the default, the
3937 security risks of using X11 forwarding are risks to the client, not to
3938 the server (closes: #320104).
3939
3940 -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 15:16:14 +0100
3941
3942openssh (1:4.1p1-7) unstable; urgency=low
3943
3944 * Do the IDEA host key check on a temporary file to avoid altering
3945 /etc/ssh/ssh_host_key itself (closes: #312312).
3946 * Work around the ssh-askpass alternative somehow ending up in manual mode
3947 pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass.
3948 * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113).
3949 * Fix XSIish uses of 'test' in openssh-server.preinst.
3950 * Policy version 3.6.2: no changes required.
3951
3952 -- Colin Watson <cjwatson@debian.org> Fri, 2 Sep 2005 16:18:11 +0100
3953
3954openssh (1:4.1p1-6) unstable; urgency=low
3955
3956 * Fix one-character typo that meant the binaries in openssh-client and
3957 openssh-server got recompiled with the wrong options during
3958 'debian/rules install' (closes: #317088, #317238, #317241).
3959
3960 -- Colin Watson <cjwatson@debian.org> Thu, 7 Jul 2005 10:56:16 +0100
3961
3962openssh (1:4.1p1-5) unstable; urgency=low
3963
3964 * Build-depend on libselinux1-dev on ppc64 too (closes: #314625).
3965 * Drop priority of ssh to extra to match the override file.
3966 * Make /usr/share/doc/openssh-server and /usr/share/doc/ssh symlinks to
3967 /usr/share/doc/openssh-client (closes: #314745).
3968 * Ship README.dns (closes: #284874).
3969 * Disable btmp logging, since Debian's /var/log/btmp has inappropriate
3970 permissions (closes: #314956).
3971 * Allow ~/.ssh/config to be group-writable, provided that the group in
3972 question contains only the file's owner (closes: #314347).
3973 * debconf template translations:
3974 - Update Brazilian Portuguese (thanks, André Luís Lopes;
3975 closes: #315477).
3976 - Add Vietnamese (thanks, Clytie Siddall; closes: #316636).
3977
3978 -- Colin Watson <cjwatson@debian.org> Sun, 3 Jul 2005 17:08:08 +0100
3979
3980openssh (1:4.1p1-4) unstable; urgency=low
3981
3982 * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5
3983 only conflicts with ssh (closes: #312475).
3984 * SELinux support (thanks, Manoj Srivastava; closes: #308555):
3985 - Added SELinux capability, and turned it on be default. Added
3986 restorecon calls in preinst and postinst (should not matter if the
3987 machine is not SELinux aware). By and large, the changes made should
3988 have no effect unless the rules file calls --with-selinux; and even
3989 then there should be no performance hit for machines not actively
3990 running SELinux.
3991 - Modified the preinst and postinst to call restorecon to set the
3992 security context for the generated public key files.
3993 - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system
3994 may want to also include pam_selinux.so.
3995 * Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies
3996 are available.
3997 * Restore /usr/lib/sftp-server temporarily, as a symlink to
3998 /usr/lib/openssh/sftp-server (closes: #312891).
3999 * Switch to debhelper compatibility level 3, since 2 is deprecated.
4000 * debconf template translations:
4001 - Update German (thanks, Jens Seidel; closes: #313949).
4002
4003 -- Colin Watson <cjwatson@debian.org> Fri, 17 Jun 2005 14:20:20 +0100
4004
4005openssh (1:4.1p1-3) unstable; urgency=low
4006
4007 * Upload to unstable.
4008
4009 -- Colin Watson <cjwatson@debian.org> Mon, 6 Jun 2005 22:28:33 +0100
4010
4011openssh (1:4.1p1-2) experimental; urgency=low
4012
4013 * Drop debconf support for allowing SSH protocol 1, which is discouraged
4014 and has not been the default since openssh 1:3.0.1p1-1. Users who need
4015 this should edit sshd_config instead (closes: #147212).
4016 * Since ssh-keysign isn't used by default (you need to set
4017 EnableSSHKeysign to "yes" in /etc/ssh/ssh_config), having a debconf
4018 question to ask whether it should be setuid is overkill, and the
4019 question text had got out of date anyway. Remove this question, ship
4020 ssh-keysign setuid in openssh-client.deb, and set a statoverride if the
4021 debconf question was previously set to false.
4022 * Add lintian overrides for the above (setuid-binary,
4023 no-debconf-templates).
4024 * Fix picky lintian errors about slogin symlinks.
4025 * Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling.
4026 * Apply Linux 2.2 workaround (see #239999) only on Linux.
4027
4028 -- Colin Watson <cjwatson@debian.org> Thu, 2 Jun 2005 00:55:58 +0100
4029
4030openssh (1:4.1p1-1) experimental; urgency=low
4031
4032 * New upstream release.
4033 - Normalise socket addresses returned by get_remote_hostname(), fixing
4034 4-in-6 mapping issues with AllowUsers et al (closes: #192234).
4035 * Take upstream's hint and disable the unsupported USE_POSIX_THREADS
4036 (closes: #295757, #308868, and possibly others; may open other bugs).
4037 Use PAM password authentication to avoid #278394. In future I may
4038 provide two sets of binaries built with and without this option, since
4039 it seems I can't win.
4040 * Disable ChallengeResponseAuthentication in new installations, returning
4041 to PasswordAuthentication by default, since it now supports PAM and
4042 apparently works better with a non-threaded sshd (closes: #247521).
4043 * openssh-server Suggests: rssh (closes: #233012).
4044 * Change libexecdir to /usr/lib/openssh, and fix up various alternatives
4045 and configuration files to match (closes: #87900, #151321).
4046 * Fix up very old sshd_config files that refer to /usr/libexec/sftp-server
4047 (closes: #141979).
4048
4049 -- Colin Watson <cjwatson@debian.org> Tue, 31 May 2005 01:33:33 +0100
4050
4051openssh (1:4.0p1-1) experimental; urgency=low
4052
4053 * New upstream release.
4054 - Port-forwarding specifications now take optional bind addresses, and
4055 the server allows client-specified bind addresses for remote port
4056 forwardings when configured with "GatewayPorts clientspecified"
4057 (closes: #87253, #192206).
4058 - ssh and ssh-keyscan now support hashing of known_hosts files for
4059 improved privacy (CAN-2005-2666). ssh-keygen has new options for
4060 managing known_hosts files, which understand hashing.
4061 - sftp supports command history and editing support using libedit
4062 (closes: #287013).
4063 - Have scp and sftp wait for the spawned ssh to exit before they exit
4064 themselves, allowing ssh to restore terminal modes (closes: #257130).
4065 - Improved the handling of bad data in authorized_keys files,
4066 eliminating fatal errors on corrupt or very large keys; e.g. linefeeds
4067 in keys only produce errors in auth.log now (closes: #220726).
4068 - Add "command mode" to ssh connection multiplexing (closes: #303452).
4069 - Mention $HOME/.hushlogin in sshd(8) FILES section (closes: #163933).
4070 * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU;
4071 closes: #296487).
4072 * Remove obsolete and unnecessary ssh/forward_warning debconf note.
4073 * Hurd build fixes (although sshd still doesn't work):
4074 - Restore X forwarding fix from #102991, lost somewhere along the way.
4075 - Link with -lcrypt.
4076 - Link with -lpthread rather than -pthread.
4077 - Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to
4078 satisfy build-dependencies.
4079 * Drop workaround for #242462 on amd64; it's been fixed properly upstream.
4080 * Enable HashKnownHosts by default. This only affects new entries; use
4081 'ssh-keygen -H' to convert an entire known_hosts file to hashed format.
4082 * Note in ssh_config(5) that the SetupTimeOut option is Debian-specific
4083 (closes: #307069).
4084 * debconf template translations:
4085 - Update Czech (thanks, Miroslav Kure; closes: #298744).
4086 - Update Finnish (thanks, Matti Pöllä; closes: #303787).
4087 - Synchronise Spanish with sarge branch (thanks, Javier
4088 Fernández-Sanguino Peña; closes: #298536).
4089 - Add Ukrainian (thanks, Eugeniy Meshcheryakov; closes: #301852).
4090
4091 -- Colin Watson <cjwatson@debian.org> Thu, 26 May 2005 11:23:18 +0100
4092
4093openssh (1:3.9p1-3) experimental; urgency=low
4094
4095 * Explain how to run sshd from inittab in README.Debian (closes: #147360).
4096 * Add debian/watch file.
4097
4098 -- Colin Watson <cjwatson@debian.org> Fri, 18 Feb 2005 00:20:16 +0000
4099
4100openssh (1:3.9p1-2) experimental; urgency=low
4101
4102 * Remove pam_nologin from /etc/pam.d/ssh, as sshd's built-in support
4103 appears to be sufficient and more useful (closes: #162996).
4104 * Depend on debconf | debconf-2.0.
4105 * Drop LoginGraceTime back to the upstream default of two minutes on new
4106 installs (closes: #289573).
4107 * debconf template translations from Ubuntu bug #1232:
4108 - Update Greek (thanks, Logiotatidis George).
4109 - Update Spanish (thanks, Santiago Erquicia).
4110
4111 -- Colin Watson <cjwatson@debian.org> Sat, 15 Jan 2005 12:37:54 +0000
4112
4113openssh (1:3.9p1-1) experimental; urgency=low
4114
4115 * New upstream release.
4116 - PAM password authentication implemented again (closes: #238699,
4117 #242119).
4118 - Implemented the ability to pass selected environment variables between
4119 the client and the server.
4120 - Fix ssh-keyscan breakage when remote server doesn't speak SSH protocol
4121 (closes: #228828).
4122 - Fix res_query detection (closes: #242462).
4123 - 'ssh -c' documentation improved (closes: #265627).
4124 * Pass LANG and LC_* environment variables from the client by default, and
4125 accept them to the server by default in new installs, although not on
4126 upgrade (closes: #264024).
4127 * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones).
4128 * Expand on openssh-client package description (closes: #273831).
4129
4130 -- Colin Watson <cjwatson@debian.org> Tue, 4 Jan 2005 14:18:31 +0000
4131
4132openssh (1:3.8.1p1-14) experimental; urgency=low
4133
4134 * We use DH_COMPAT=2, so build-depend on debhelper (>= 2).
4135 * Fix timing information leak allowing discovery of invalid usernames in
4136 PAM keyboard-interactive authentication (backported from a patch by
4137 Darren Tucker; closes: #281595).
4138 * Make sure that there's a delay in PAM keyboard-interactive
4139 authentication when PermitRootLogin is not set to yes and the correct
4140 root password is entered (closes: #248747).
4141
4142 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 18:09:37 +0000
4143
4144openssh (1:3.8.1p1-13) experimental; urgency=low
4145
4146 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
4147 * debconf template translations:
4148 - Update Dutch (thanks, cobaco; closes: #278715).
4149 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
4150
4151 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 12:03:13 +0000
4152
4153openssh (1:3.8.1p1-12) experimental; urgency=low
4154
4155 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
4156 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
4157 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
4158 implementations apparently have problems with the long version string.
4159 This is of course a bug in those implementations, but since the extent
4160 of the problem is unknown it's best to play safe (closes: #275731).
4161 * debconf template translations:
4162 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
4163 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
4164 - Update French (thanks, Denis Barbier; closes: #276703).
4165 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
4166
4167 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 19:21:17 +0100
4168
4169openssh (1:3.8.1p1-11) experimental; urgency=high
4170
4171 * Move sshd_config(5) to openssh-server, where it belongs.
4172 * If PasswordAuthentication is disabled, then offer to disable
4173 ChallengeResponseAuthentication too. The current PAM code will attempt
4174 password-style authentication if ChallengeResponseAuthentication is
4175 enabled (closes: #250369).
4176 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
4177 later and then upgraded. Sorry about that ... for this reason, the
4178 default answer is to leave ChallengeResponseAuthentication enabled.
4179
4180 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:28:20 +0100
4181
4182openssh (1:3.8.1p1-10) experimental; urgency=low
4183
4184 * Don't install the ssh-askpass-gnome .desktop file by default; I've had
4185 too many GNOME people tell me it's the wrong thing to be doing. I've
4186 left it in /usr/share/doc/ssh-askpass-gnome/examples/ for now.
4187
4188 -- Colin Watson <cjwatson@debian.org> Wed, 25 Aug 2004 18:18:14 +0100
4189
4190openssh (1:3.8.1p1-9) experimental; urgency=low
4191
4192 * Split the ssh binary package into openssh-client and openssh-server
4193 (closes: #39741). openssh-server depends on openssh-client for some
4194 common functionality; it didn't seem worth creating yet another package
4195 for this. openssh-client is priority standard, openssh-server optional.
4196 * New transitional ssh package, priority optional, depending on
4197 openssh-client and openssh-server. May be removed once nothing depends
4198 on it.
4199 * When upgrading from ssh to openssh-{client,server}, it's very difficult
4200 for the maintainer scripts to find out what version we're upgrading from
4201 without dodgy dpkg hackery. I've therefore taken the opportunity to move
4202 a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged
4203 and ssh/user_environment_tell.
4204 * Add a heuristic to try to make sure the sshd_config upgrade to >= 3.7
4205 happens even though we don't know what version we're upgrading from.
4206 * Remove /etc/ssh/sshd_not_to_be_run on purge of openssh-server. For now
4207 (until sarge+2) it's still honoured to avoid breaking existing
4208 configurations, but the right approach is now to remove the
4209 openssh-server package if you don't want to run the server. Add a NEWS
4210 item to that effect.
4211
4212 -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100
4213
4214openssh (1:3.8.1p1-8.sarge.4) unstable; urgency=high
4215
4216 * Fix timing information leak allowing discovery of invalid usernames in
4217 PAM keyboard-interactive authentication (backported from a patch by
4218 Darren Tucker; closes: #281595).
4219 * Make sure that there's a delay in PAM keyboard-interactive
4220 authentication when PermitRootLogin is not set to yes and the correct
4221 root password is entered (closes: #248747).
4222
4223 -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 12:37:16 +0000
4224
4225openssh (1:3.8.1p1-8.sarge.3) unstable; urgency=low
4226
4227 * Enable threading for PAM, on Sam Hartman's advice (closes: #278394).
4228 * debconf template translations:
4229 - Update Dutch (thanks, cobaco; closes: #278715).
4230 * Correct README.Debian's ForwardX11Trusted description (closes: #280190).
4231
4232 -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 10:31:12 +0000
4233
4234openssh (1:3.8.1p1-8.sarge.2) unstable; urgency=low
4235
4236 * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754).
4237 * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian
4238 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH
4239 implementations apparently have problems with the long version string.
4240 This is of course a bug in those implementations, but since the extent
4241 of the problem is unknown it's best to play safe (closes: #275731).
4242 * debconf template translations:
4243 - Add Finnish (thanks, Matti Pöllä; closes: #265339).
4244 - Update Danish (thanks, Morten Brix Pedersen; closes: #275895).
4245 - Update French (thanks, Denis Barbier; closes: #276703).
4246 - Update Japanese (thanks, Kenshi Muto; closes: #277438).
4247
4248 -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 17:57:14 +0100
4249
4250openssh (1:3.8.1p1-8.sarge.1) unstable; urgency=high
4251
4252 * If PasswordAuthentication is disabled, then offer to disable
4253 ChallengeResponseAuthentication too. The current PAM code will attempt
4254 password-style authentication if ChallengeResponseAuthentication is
4255 enabled (closes: #250369).
4256 * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or
4257 later and then upgraded. Sorry about that ... for this reason, the
4258 default answer is to leave ChallengeResponseAuthentication enabled.
4259
4260 -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:21:55 +0100
4261
4262openssh (1:3.8.1p1-8) unstable; urgency=high
4263
4264 * Matthew Vernon:
4265 - Add a GPL exception to the licensing terms of the Debian patch
4266 (closes: #211644).
4267
4268 -- Colin Watson <cjwatson@debian.org> Thu, 29 Jul 2004 13:28:47 +0100
4269
4270openssh (1:3.8.1p1-7) unstable; urgency=low
4271
4272 * Re-enable shadow password support in openssh-server-udeb, at Bastian
4273 Blank's request (closes: #260800).
4274
4275 -- Colin Watson <cjwatson@debian.org> Thu, 22 Jul 2004 10:56:06 +0100
4276
4277openssh (1:3.8.1p1-6) unstable; urgency=low
4278
4279 * Implement hack in
4280 http://lists.debian.org/debian-boot/2004/07/msg01207.html to get
4281 openssh-client-udeb to show up as a retrievable debian-installer
4282 component.
4283 * Generate host keys in postinst only if the relevant HostKey directives
4284 are found in sshd_config (closes: #87946).
4285
4286 -- Colin Watson <cjwatson@debian.org> Wed, 21 Jul 2004 15:14:46 +0100
4287
4288openssh (1:3.8.1p1-5) unstable; urgency=medium
4289
4290 * Update German debconf template translation (thanks, Helge Kreutzmann;
4291 closes: #252226).
4292 * Remove Suggests: dnsutils, as it was only needed for
4293 make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan.
4294 * Disable shadow password support in openssh-server-udeb.
4295 * Fix non-portable shell constructs in maintainer scripts, Makefile, and
4296 ssh-copy-id (thanks, David Weinehall; closes: #258517).
4297 * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD
4298 handler kill the PAM thread if its waitpid() call returns 0, as well as
4299 the previous check for -1 (closes: #252676).
4300 * Add scp and sftp to openssh-client-udeb. It might not be very 'u' any
4301 more; oh well.
4302
4303 -- Colin Watson <cjwatson@debian.org> Sat, 10 Jul 2004 13:57:27 +0100
4304
4305openssh (1:3.8.1p1-4) unstable; urgency=medium
4306
4307 * Kill off PAM thread if privsep slave dies (closes: #248125).
4308
4309 -- Colin Watson <cjwatson@debian.org> Fri, 28 May 2004 17:58:45 -0300
4310
4311openssh (1:3.8.1p1-3) unstable; urgency=low
4312
4313 * Add ssh-keygen to openssh-server-udeb.
4314
4315 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 16:31:52 +0100
4316
4317openssh (1:3.8.1p1-2) unstable; urgency=low
4318
4319 * Add Catalan debconf template translation (thanks, Aleix Badia i Bosch;
4320 closes: #248748).
4321 * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb
4322 (not yet uploaded).
4323 * Restore ssh-askpass-gnome binary, lost by mistake.
4324 * Don't link against libnsl in udeb builds.
4325
4326 -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 11:15:58 +0100
4327
4328openssh (1:3.8.1p1-1) unstable; urgency=low
4329
4330 * New upstream release.
4331 - Use a longer buffer for tty names in utmp (closes: #247538).
4332 * Make sure there's a newline at the end of sshd_config before adding
4333 'UsePAM yes' (closes: #244829).
4334 * Generate a new .orig.tar.gz without RFC.nroff, and remove
4335 /usr/share/doc/ssh/RFC.gz (closes: #211640). It isn't DFSG-free and only
4336 documents the obsolete SSH1 protocol, not to mention that it was never a
4337 real RFC but only an Internet-Draft. It's available from
4338 http://www.free.lp.se/bamse/draft-ylonen-ssh-protocol-00.txt if you want
4339 it for some reason.
4340 * Add openssh-client-udeb and openssh-server-udeb binary packages for use
4341 in debian-installer. They still need libnss_files to be supplied in udeb
4342 form by glibc.
4343 * Work around lack of res_query weak alias in libresolv on amd64 (see
4344 #242462, awaiting real fix upstream).
4345 * Fix grammar in sshd(8) (closes: #238753).
4346 * Add .desktop file and icon for ssh-askpass-gnome (closes: #232333).
4347 * Update Polish debconf template translation (thanks, Emil Nowak;
4348 closes: #242808).
4349 * Add Turkish debconf template translation (thanks, Recai Oktaş;
4350 closes: #246068).
4351
4352 -- Colin Watson <cjwatson@debian.org> Tue, 11 May 2004 23:38:10 +0100
4353
4354openssh (1:3.8p1-3) unstable; urgency=low
4355
4356 * Remove deprecated ReverseMappingCheck option from newly generated
4357 sshd_config files (closes: #239987).
4358 * Build everything apart from contrib in a subdirectory, to allow for
4359 multiple builds.
4360 * Some older kernels are missing setresuid() and setresgid(), so don't try
4361 to use them. setreuid() and setregid() will do well enough for our
4362 purposes (closes: #239999).
4363
4364 -- Colin Watson <cjwatson@debian.org> Mon, 5 Apr 2004 21:23:43 +0100
4365
4366openssh (1:3.8p1-2) unstable; urgency=medium
4367
4368 * Disable PasswordAuthentication for new installations (closes: #236810).
4369 * Turn off the new ForwardX11Trusted by default, returning to the
4370 semantics of 3.7 and earlier, since it seems immature and causes far too
4371 many problems with existing setups. See README.Debian for details
4372 (closes: #237021).
4373
4374 -- Colin Watson <cjwatson@debian.org> Wed, 10 Mar 2004 10:33:07 +0000
4375
4376openssh (1:3.8p1-1) unstable; urgency=low
4377
4378 * New upstream release (closes: #232281):
4379 - New PAM implementation based on that in FreeBSD. This runs PAM session
4380 modules before dropping privileges (closes: #132681, #150968).
4381 - Since PAM session modules are run as root, we can turn pam_limits back
4382 on by default, and it no longer spits out "Operation not permitted" to
4383 syslog (closes: #171673).
4384 - Password expiry works again (closes: #153235).
4385 - 'ssh -q' suppresses login banner (closes: #134589).
4386 - sshd doesn't lie to PAM about invalid usernames (closes: #157078).
4387 - ssh-add prints key comment on each prompt (closes: #181869).
4388 - Punctuation formatting fixed in man pages (closes: #191131).
4389 - EnableSSHKeysign documented in ssh_config(5) (closes: #224457).
4390 * Add 'UsePAM yes' to /etc/ssh/sshd_config on upgrade from versions older
4391 than this, to maintain the standard Debian sshd configuration.
4392 * Comment out PAMAuthenticationViaKbdInt and RhostsAuthentication in
4393 sshd_config on upgrade. Neither option is supported any more.
4394 * Privilege separation and PAM are now properly supported together, so
4395 remove both debconf questions related to them and simply set it
4396 unconditionally in newly generated sshd_config files (closes: #228838).
4397 * ServerAliveInterval implemented upstream, so ProtocolKeepAlives is now a
4398 compatibility alias. The semantics differ slightly, though; see
4399 ssh_config(5) for details.
4400 * Implement SSH1 support for ServerAliveInterval using SSH_MSG_IGNORE. As
4401 documented in ssh_config(5), it's not as good as the SSH2 version.
4402 * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and
4403 -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary.
4404 * Update config.guess and config.sub from autotools-dev 20040105.1.
4405 * Darren Tucker:
4406 - Reset signal status when starting pam auth thread, prevent hanging
4407 during PAM keyboard-interactive authentications.
4408 - Fix a non-security-critical segfault in PAM authentication.
4409 * Add debconf template translations:
4410 - Greek (thanks, Konstantinos Margaritis; closes: #232843).
4411 - Italian (thanks, Renato Gini; closes: #234777).
4412
4413 -- Colin Watson <cjwatson@debian.org> Sat, 6 Mar 2004 18:43:44 +0000
4414
4415openssh (1:3.6.1p2-12) unstable; urgency=low
4416
4417 * Update Spanish debconf template translation (thanks, Javier
4418 Fernández-Sanguino Peña; closes: #228242).
4419 * Add debconf template translations:
4420 - Czech (thanks, Miroslav Kure; closes: #230110).
4421 - Simplified Chinese (thanks, Hiei Xu; closes: #230726).
4422
4423 -- Colin Watson <cjwatson@debian.org> Wed, 11 Feb 2004 09:37:57 +0000
4424
4425openssh (1:3.6.1p2-11) unstable; urgency=low
4426
4427 * Comment out pam_limits in default configuration, for now at least
4428 (closes: #198254).
4429 * Use invoke-rc.d (if it exists) to run the init script.
4430 * Backport format string bug fix in sshconnect.c (closes: #225238).
4431 * ssh-copy-id exits if ssh fails (closes: #215252).
4432
4433 -- Colin Watson <cjwatson@debian.org> Sun, 4 Jan 2004 18:59:21 +0000
4434
4435openssh (1:3.6.1p2-10) unstable; urgency=low
4436
4437 * Use --retry in init script when restarting rather than sleeping, to make
4438 sure the old process is dead (thanks, Herbert Xu; closes: #212117).
4439 Depend on dpkg (>= 1.9.0) for start-stop-daemon's --retry option.
4440 * Update debconf template translations:
4441 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #219844).
4442 - Danish (thanks, Morten Brix Pedersen; closes: #217964).
4443 - Japanese (thanks, Kenshi Muto; closes: #212497).
4444 - Russian (thanks, Ilgiz Kalmetev).
4445 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #211832).
4446 * Add Dutch debconf template translation (thanks, cobaco;
4447 closes: #215372).
4448 * Update config.guess and config.sub from autotools-dev 20031007.1
4449 (closes: #217696).
4450 * Implement New World Order for PAM configuration, including
4451 /etc/pam.d/common-* from /etc/pam.d/ssh (closes: #212959).
4452 - To backport this release to woody, you need to set DEB_BUILD_SSH_WOODY
4453 in your environment. See README.Debian.
4454 * Add more commentary to /etc/pam.d/ssh.
4455
4456 -- Colin Watson <cjwatson@debian.org> Sun, 16 Nov 2003 01:14:16 +0000
4457
4458openssh (1:3.6.1p2-9) unstable; urgency=high
4459
4460 * Merge even more buffer allocation fixes from upstream (CAN-2003-0682;
4461 closes: #211434).
4462
4463 -- Colin Watson <cjwatson@debian.org> Fri, 19 Sep 2003 10:25:25 +0100
4464
4465openssh (1:3.6.1p2-8) unstable; urgency=high
4466
4467 * Merge more buffer allocation fixes from new upstream version 3.7.1p1
4468 (closes: #211324).
4469
4470 -- Colin Watson <cjwatson@debian.org> Wed, 17 Sep 2003 03:07:19 +0100
4471
4472openssh (1:3.6.1p2-7) unstable; urgency=high
4473
4474 * Update debconf template translations:
4475 - French (thanks, Christian Perrier; closes: #208801).
4476 - Japanese (thanks, Kenshi Muto; closes: #210380).
4477 * Some small improvements to the English templates courtesy of Christian
4478 Perrier. I've manually unfuzzied a few translations where it was
4479 obvious, on Christian's advice, but the others will have to be updated.
4480 * Document how to generate an RSA1 host key (closes: #141703).
4481 * Incorporate NMU fix for early buffer expansion vulnerability,
4482 CAN-2003-0693 (closes: #211205). Thanks to Michael Stone.
4483
4484 -- Colin Watson <cjwatson@debian.org> Tue, 16 Sep 2003 14:32:28 +0100
4485
4486openssh (1:3.6.1p2-6.0) unstable; urgency=high
4487
4488 * SECURITY: fix for CAN-2003-0693, buffer allocation error
4489
4490 -- Michael Stone <mstone@debian.org> Tue, 16 Sep 2003 08:27:07 -0400
4491
4492openssh (1:3.6.1p2-6) unstable; urgency=medium
4493
4494 * Use a more CVS-friendly means of setting SSH_VERSION.
4495 * Update Brazilian Portuguese debconf template translation (thanks, Andre
4496 Luis Lopes; closes: #208036).
4497 * Don't run 'sshd -t' in init script if the server isn't to be run
4498 (closes: #197576).
4499 * Fix login delay, spurious auth.log entry, and PermitRootLogin
4500 information leakage due to PAM issues with upstream's recent security
4501 update (thanks, Darren Tucker; closes: #99168, #192207, #193546).
4502 * Policy version 3.6.1: recode this changelog to UTF-8.
4503
4504 -- Colin Watson <cjwatson@debian.org> Wed, 3 Sep 2003 19:14:02 +0100
4505
4506openssh (1:3.6.1p2-5) unstable; urgency=low
4507
4508 * Disable cmsg_type check for file descriptor passing when running on
4509 Linux 2.0 (closes: #150976). Remove comments about non-functional
4510 privilege separation on 2.0 from ssh/privsep_ask and ssh/privsep_tell
4511 debconf questions and from README.Debian, since it should all now work.
4512 * Fix "defails" typo in generated sshd_config (closes: #206484).
4513 * Backport upstream patch to strip trailing whitespace (including
4514 newlines) from configuration directives (closes: #192079).
4515
4516 -- Colin Watson <cjwatson@debian.org> Wed, 27 Aug 2003 02:19:57 +0100
4517
4518openssh (1:3.6.1p2-4) unstable; urgency=low
4519
4520 * getent can get just one key; no need to use grep (thanks, James Troup).
4521 * Move /usr/local/bin to the front of the default path, following
4522 /etc/login.defs (closes: #201150).
4523 * Remove specifics of problematic countries from package description
4524 (closes: #197040).
4525 * Update Spanish debconf template translation (thanks, Carlos Valdivia
4526 Yagüe; closes: #198456).
4527 * Backport upstream patch to pass monitor signals through to child
4528 (closes: #164797).
4529
4530 -- Colin Watson <cjwatson@debian.org> Sun, 27 Jul 2003 17:31:15 +0100
4531
4532openssh (1:3.6.1p2-3) unstable; urgency=low
4533
4534 * Update French debconf template translation (thanks, Christian Perrier;
4535 closes: #194323).
4536 * Version the adduser dependency for --no-create-home (closes: #195756).
4537 * Add a version of moduli(5), namely revision 1.7 of
4538 http://www.openbsd.org/cgi-bin/cvsweb/src/share/man/man5/moduli.5 with
4539 '/etc/moduli' changed to '/etc/ssh/moduli' throughout (closes: #196061).
4540
4541 -- Colin Watson <cjwatson@debian.org> Mon, 9 Jun 2003 02:51:35 +0100
4542
4543openssh (1:3.6.1p2-2) unstable; urgency=low
4544
4545 * Force /etc/default/ssh to be non-executable, since dpkg apparently
4546 doesn't deal with permissions changes on conffiles (closes: #192966).
4547 * Use debconf 0.5's seen flag rather than the deprecated isdefault.
4548 * Add GPL location to copyright file.
4549 * Remove debian/postinst.old.
4550 * Switch to po-debconf, with some careful manual use of po2debconf to
4551 ensure that the source package continues to build smoothly on woody
4552 (closes: #183986).
4553 * Update debconf template translations:
4554 - Brazilian Portugese (thanks, Andre Luis Lopes; see #183986).
4555 - Japanese (thanks, Tomohiro KUBOTA; closes: #192429).
4556 * Compile with -fno-builtin-log for now, otherwise gcc-3.3 complains
4557 "log.h:59: warning: conflicting types for built-in function `log'". The
4558 OpenSSH log() function has been renamed in upstream CVS.
4559
4560 -- Colin Watson <cjwatson@debian.org> Mon, 19 May 2003 01:52:38 +0100
4561
4562openssh (1:3.6.1p2-1) unstable; urgency=medium
4563
4564 * New upstream release, including fix for PAM user-discovery security hole
4565 (closes: #191681).
4566 * Fix ChallengeResponseAuthentication default in generated sshd_config
4567 (closes: #106037).
4568 * Put newlines after full stops in man page documentation for
4569 ProtocolKeepAlives and SetupTimeOut.
4570 * Policy version 3.5.9: support DEB_BUILD_OPTIONS=noopt, build
4571 gnome-ssh-askpass with -g and -Wall flags.
4572 * Really ask ssh/new_config debconf question before trying to fetch its
4573 value (closes: #188721).
4574 * On purge, remove only the files we know about in /etc/ssh rather than
4575 the whole thing, and remove the directory if that leaves it empty
4576 (closes: #176679).
4577 * ssh has depended on debconf for some time now with no complaints, so:
4578 - Simplify the postinst by relying on debconf being present. (The absent
4579 case was buggy anyway.)
4580 - Get rid of "if you have not installed debconf" text in README.Debian,
4581 and generally update the "/usr/bin/ssh not SUID" entry.
4582 * More README.Debian work:
4583 - Reorganize into "UPGRADE ISSUES" and "OTHER ISSUES", in an effort to
4584 make it easier for people to find the former. The upgrade issues
4585 should probably be sorted by version somehow.
4586 - Document X11UseLocalhost under "X11 Forwarding" (closes: #150913).
4587 * Fix setting of IP flags for interactive sessions (upstream bug #541).
4588
4589 -- Colin Watson <cjwatson@debian.org> Mon, 5 May 2003 17:47:40 +0100
4590
4591openssh (1:3.6.1p1-1) unstable; urgency=low
4592
4593 * New upstream release (thanks, Laurence J. Lane).
4594 * debian/control: ssh-askpass-gnome is now Section: gnome, following the
4595 override file.
4596
4597 -- Colin Watson <cjwatson@debian.org> Wed, 2 Apr 2003 00:51:02 +0100
4598
4599openssh (1:3.6p1-1) unstable; urgency=low
4600
4601 * New upstream release.
4602 - Workaround applied upstream for a bug in the interaction of glibc's
4603 getaddrinfo() with the Linux 2.2 kernel (closes: #155814).
4604 - As such, it should now be safe to remove --with-ipv4-default, so
4605 starting sshd with -6 is no longer necessary (closes: #79861 and lots
4606 of other merged bugs).
4607 - ssh-copy-id prints usage when run without arguments (closes: #71376).
4608 - scp exits 1 if ssh fails (closes: #138400).
4609 - sshd writes to utmp's ut_addr_v6 field in IPv6 mode (closes: #167867).
4610 - 'ssh-add -c' causes ssh-agent to ask the user each time a key is used
4611 (closes: #109795).
4612 * Install /etc/default/ssh non-executable (closes: #185537).
4613
4614 -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2003 23:00:59 +0100
4615
4616openssh (1:3.5p1-5) unstable; urgency=low
4617
4618 * Add /etc/default/ssh (closes: #161049).
4619 * Run the init script under 'set -e' (closes: #175010).
4620 * Change the default superuser path to include /sbin, /usr/sbin, and
4621 /usr/local/sbin (closes: #128235, #151267). Using login.defs would be
4622 nice, but that belongs to another package. Without a defined API to
4623 retrieve its settings, parsing it is off-limits.
4624 * Build ssh-askpass-gnome with GNOME 2. The source package should still
4625 support building on stable with GNOME 1, using the alternate
4626 libgnome-dev build-dependency (thanks, Colin Walters; closes: #167582).
4627
4628 -- Colin Watson <cjwatson@debian.org> Sun, 9 Mar 2003 20:12:10 +0000
4629
4630openssh (1:3.5p1-4) unstable; urgency=low
4631
4632 * Point rlogin and rcp alternatives at slogin and scp respectively rather
4633 than ssh (closes: #121103, #151666). Fix alternative removal to match;
4634 previously it was completely wrong anyway.
4635 * Find out whether /etc/ssh/sshd_not_to_be_run exists and set the debconf
4636 question's default using that information, rather than using debconf as
4637 a registry. Other solutions may be better in the long run, but this is
4638 at least correct (thanks, Matthew Woodcraft; closes: #84725).
4639 * Stop using pam_lastlog, as it doesn't currently work well as a session
4640 module when privilege separation is enabled; it can usually read
4641 /var/log/lastlog but can't write to it. Instead, just use sshd's
4642 built-in support, already enabled by default (closes: #151297, #169938).
4643 * Use 'ssh-keygen -q' rather than redirecting output to /dev/null.
4644 * Add a "this may take some time" warning when creating host keys on
4645 installation (part of #110094).
4646 * When restarting via the init script, check for sshd_not_to_be_run after
4647 stopping sshd (idea from Tomas Pospisek; closes: #149850).
4648 * Append /usr/sbin:/sbin to the init script's $PATH, just in case of
4649 strangeness (closes: #115138).
4650 * Fix a dpkg-statoverride call to redirect stdout to /dev/null, not
4651 stderr.
4652 * Correct copyright file typo: "orignal" -> "original" (closes: #176490).
4653 * Rebuild with libssl0.9.7 (closes: #176983).
4654 * We're up to policy version 3.5.6. DEB_BUILD_OPTIONS stuff still needs to
4655 be looked at.
4656
4657 -- Colin Watson <cjwatson@debian.org> Sat, 18 Jan 2003 01:37:23 +0000
4658
4659openssh (1:3.5p1-3) unstable; urgency=low
4660
4661 * Happy new year!
4662 * Use getent rather than id to find out whether the sshd user exists
4663 (closes: #150974).
4664 * Remove some duplication from the postinst's ssh-keysign setuid code.
4665 * Replace db_text with db_input throughout debian/config. (db_text has
4666 been a compatibility wrapper since debconf 0.1.5.)
4667 * Warn about PermitUserEnvironment on upgrade (closes: #167895).
4668 * Use 'make install-nokeys', and disable unused debhelper commands,
4669 thereby forward-porting the last pieces of Zack Weinberg's patch
4670 (closes: #68341).
4671 * Move the man page for gnome-ssh-askpass from the ssh package to
4672 ssh-askpass-gnome (closes: #174449).
4673 * Build with -DLOGIN_NO_ENDOPT, since Debian's /bin/login doesn't accept
4674 '--' to terminate the list of options (closes: #171554).
4675 * Add Jonathan Amery's ssh-argv0 script (closes: #111341).
4676 * Update Danish debconf template (thanks, Morten Brix Pedersen;
4677 closes: #174757).
4678 * Document setgid ssh-agent's effect on certain environment variables in
4679 README.Debian (closes: #167974).
4680 * Document interoperability problems between scp and ssh.com's server in
4681 README.Debian, and suggest some workarounds (closes: #174662).
4682
4683 -- Colin Watson <cjwatson@debian.org> Wed, 1 Jan 2003 14:18:30 +0000
4684
4685openssh (1:3.5p1-2) unstable; urgency=low
4686
4687 * Mention in the ssh package description that it provides both ssh and
4688 sshd (closes: #99680).
4689 * Create a system group for ssh-agent, not a user group (closes: #167669).
4690
4691 -- Colin Watson <cjwatson@debian.org> Mon, 4 Nov 2002 13:43:53 +0000
4692
4693openssh (1:3.5p1-1) unstable; urgency=low
4694
4695 * New upstream release.
4696 - Fixes typo in ssh-add usage (closes: #152239).
4697 - Fixes 'PermitRootLogin forced-commands-only' (closes: #166184).
4698 - ~/.ssh/environment and environment= options in ~/.ssh/authorized_keys
4699 are deprecated for security reasons and will eventually go away. For
4700 now they can be re-enabled by setting 'PermitUserEnvironment yes' in
4701 sshd_config.
4702 - ssh-agent is installed setgid to prevent ptrace() attacks. The group
4703 actually doesn't matter, as it drops privileges immediately, but to
4704 avoid confusion the postinst creates a new 'ssh' group for it.
4705 * Obsolete patches:
4706 - Solar Designer's privsep+compression patch for Linux 2.2 (see
4707 1:3.3p1-0.0woody1).
4708 - Hostbased auth ssh-keysign backport (see 1:3.4p1-4).
4709
4710 * Remove duplicated phrase in ssh_config(5) (closes: #152404).
4711 * Source the debconf confmodule at the top of the postrm rather than at
4712 the bottom, to avoid making future non-idempotency problems worse (see
4713 #151035).
4714 * Debconf templates:
4715 - Add Polish (thanks, Grzegorz Kusnierz).
4716 - Update French (thanks, Denis Barbier; closes: #132509).
4717 - Update Spanish (thanks, Carlos Valdivia Yagüe; closes: #164716).
4718 * Write a man page for gnome-ssh-askpass, and link it to ssh-askpass.1 if
4719 this is the selected ssh-askpass alternative (closes: #67775).
4720
4721 -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100
4722
4723openssh (1:3.4p1-4) unstable; urgency=low
4724
4725 * Allow ssh-krb5 in ssh-askpass-gnome's dependencies (closes: #129532).
4726 * Restore Russia to list of countries where encryption is problematic (see
4727 #148951 and http://www.average.org/freecrypto/).
4728 * Drop ssh-askpass-gnome's priority to optional, per the override file.
4729 * Drop the PAM special case for hurd-i386 (closes: #99157).
4730 * s/dile/idle/ in ssh_config(5) (closes: #118331).
4731 * Note in README.Debian that you need xauth from xbase-clients on the
4732 server for X11 forwarding (closes: #140269).
4733 * Use correct path to upstream README in copyright file (closes: #146037).
4734 * Document the units for ProtocolKeepAlives (closes: #159479).
4735 * Backport upstream patch to fix hostbased auth (closes: #117114).
4736 * Add -g to CFLAGS.
4737
4738 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 18:58:53 +0100
4739
4740openssh (1:3.4p1-3) unstable; urgency=low
4741
4742 * Add myself to Uploaders: and begin acting as temporary maintainer, at
4743 Matthew's request. (Normal service will resume in some months' time.)
4744 * Add sharutils to Build-Depends (closes: #138465).
4745 * Stop creating the /usr/doc/ssh symlink.
4746
4747 * Fix some debconf template typos (closes: #160358).
4748 * Split debconf templates into one file per language.
4749 * Add debconf template translations:
4750 - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #106173).
4751 - Danish (thanks, Claus Hindsgaul; closes: #126607).
4752 - Japanese (thanks, Tomohiro KUBOTA; closes: #137427).
4753 - Russian (thanks, Ilgiz Kalmetev; closes: #136610).
4754 - Spanish (thanks, Carlos Valdivia Yagüe; closes: #129041).
4755 * Update debconf template translations:
4756 - French (thanks, Igor Genibel; closes: #151361).
4757 - German (thanks, Axel Noetzold; closes: #147069).
4758 * Some of these translations are fuzzy. Please send updates.
4759
4760 -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 14:09:57 +0100
4761
4762openssh (1:3.4p1-2) unstable; urgency=high
4763
4764 * Get a security-fixed version into unstable
4765 * Also tidy README.Debian up a little
4766
4767 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 17:20:59 +0100
4768
4769openssh (1:3.4p1-1) testing; urgency=high
4770
4771 * Extend my tendrils back into this package (Closes: #150915, #151098)
4772 * thanks to the security team for their work
4773 * no thanks to ISS/Theo de Raadt for their handling of these bugs
4774 * save old sshd_configs to sshd_config.dpkg-old when auto-generating a
4775 new one
4776 * tell/ask the user about PriviledgeSeparation
4777 * /etc/init.d/ssh run will now create the chroot empty dir if necessary
4778 * Remove our previous statoverride on /usr/bin/ssh (only for people
4779 upgrading from a version where we'd put one in ourselves!)
4780 * Stop slandering Russia, since someone asked so nicely (Closes: #148951)
4781 * Reduce the sleep time in /etc/init.d/ssh during a restart
4782
4783 -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 15:52:10 +0100
4784
4785openssh (1:3.4p1-0.0woody1) testing-security; urgency=high
4786
4787 * NMU by the security team.
4788 * New upstream version
4789
4790 -- Michael Stone <mstone@debian.org> Wed, 26 Jun 2002 15:40:38 -0400
4791
4792openssh (1:3.3p1-0.0woody4) testing-security; urgency=high
4793
4794 * NMU by the security team.
4795 * fix error when /etc/ssh/sshd_config exists on new install
4796 * check that user doesn't exist before running adduser
4797 * use openssl internal random unconditionally
4798
4799 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 19:44:39 -0400
4800
4801openssh (1:3.3p1-0.0woody3) testing-security; urgency=high
4802
4803 * NMU by the security team.
4804 * use correct home directory when sshd user is created
4805
4806 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
4807
4808openssh (1:3.3p1-0.0woody2) testing-security; urgency=high
4809
4810 * NMU by the security team.
4811 * Fix rsa1 key creation (Closes: #150949)
4812 * don't fail if sshd user removal fails
4813 * depends: on adduser (Closes: #150907)
4814
4815 -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400
4816
4817openssh (1:3.3p1-0.0woody1) testing-security; urgency=high
4818
4819 * NMU by the security team.
4820 * New upstream version.
4821 - Enable privilege separation by default.
4822 * Include patch from Solar Designer for privilege separation and
4823 compression on 2.2.x kernels.
4824 * Remove --disable-suid-ssh from configure.
4825 * Support setuid ssh-keysign binary instead of setuid ssh client.
4826 * Check sshd configuration before restarting.
4827
4828 -- Daniel Jacobowitz <dan@debian.org> Mon, 24 Jun 2002 13:43:44 -0400
4829
4830openssh (1:3.0.2p1-9) unstable; urgency=high
4831
4832 * Thanks to those who NMUd
4833 * The only change in this version is to debian/control - I've removed
4834 the bit that says you can't export it from the US - it would look
4835 pretty daft to say this about a package in main! Also, it's now OK
4836 to use crypto in France, so I've edited that comment slightly
4837 * Correct a path in README.Debian too (Closes: #138634)
4838
4839 -- Matthew Vernon <matthew@debian.org> Sun, 4 Apr 2002 09:52:59 +0100
4840
4841openssh (1:3.0.2p1-8.3) unstable; urgency=medium
4842
4843 * NMU
4844 * Really set urgency to medium this time (oops)
4845 * Fix priority to standard per override while I'm at it
4846
4847 -- Aaron M. Ucko <ucko@debian.org> Sun, 24 Mar 2002 09:00:08 -0500
4848
4849openssh (1:3.0.2p1-8.2) unstable; urgency=low
4850
4851 * NMU with maintainer's permission
4852 * Prepare for upcoming ssh-nonfree transitional packages per
4853 <http://lists.debian.org/debian-ssh/2002/debian-ssh-200203/msg00008.html>
4854 * Urgency medium because it would really be good to get this into woody
4855 before it releases
4856 * Fix sections to match override file
4857 * Reissued due to clash with non-US -> main move
4858
4859 -- Aaron M. Ucko <ucko@debian.org> Sat, 23 Mar 2002 21:21:52 -0500
4860
4861openssh (1:3.0.2p1-8.1) unstable; urgency=low
4862
4863 * NMU
4864 * Move from non-US to mani
4865
4866 -- LaMont Jones <lamont@debian.org> Thu, 21 Mar 2002 09:33:50 -0700
4867
4868openssh (1:3.0.2p1-8) unstable; urgency=critical
4869
4870 * Security fix - patch from upstream (Closes: #137209, #137210)
4871 * Undo the changes in the unreleased -7, since they appear to break
4872 things here. Accordingly, the code change is minimal, and I'm
4873 happy to get it into testing ASAP
4874
4875 -- Matthew Vernon <matthew@debian.org> Thu, 7 Mar 2002 14:25:23 +0000
4876
4877openssh (1:3.0.2p1-7) unstable; urgency=high
4878
4879 * Build to support IPv6 and IPv4 by default again
4880
4881 -- Matthew Vernon <matthew@debian.org> Sat, 2 Mar 2002 00:25:05 +0000
4882
4883openssh (1:3.0.2p1-6) unstable; urgency=high
4884
4885 * Correct error in the clean target (Closes: #130868)
4886
4887 -- Matthew Vernon <matthew@debian.org> Sat, 26 Jan 2002 00:32:00 +0000
4888
4889openssh (1:3.0.2p1-5) unstable; urgency=medium
4890
4891 * Include the Debian version in our identification, to make it easier to
4892 audit networks for patched versions in future
4893
4894 -- Matthew Vernon <matthew@debian.org> Mon, 21 Jan 2002 17:16:10 +0000
4895
4896openssh (1:3.0.2p1-4) unstable; urgency=medium
4897
4898 * If we're asked to not run sshd, stop any running sshd's first
4899 (Closes: #129327)
4900
4901 -- Matthew Vernon <matthew@debian.org> Wed, 16 Jan 2002 21:24:16 +0000
4902
4903openssh (1:3.0.2p1-3) unstable; urgency=high
4904
4905 * Fix /etc/pam.d/ssh to not set $MAIL (Closes: #128913)
4906 * Remove extra debconf suggestion (Closes: #128094)
4907 * Mmm. speedy bug-fixing :-)
4908
4909 -- Matthew Vernon <matthew@debian.org> Sat, 12 Jan 2002 17:23:58 +0000
4910
4911openssh (1:3.0.2p1-2) unstable; urgency=high
4912
4913 * Fix postinst to not automatically overwrite sshd_config (!)
4914 (Closes: #127842, #127867)
4915 * Add section in README.Debian about the PermitRootLogin setting
4916
4917 -- Matthew Vernon <matthew@debian.org> Sat, 5 Jan 2003 05:26:30 +0000
4918
4919openssh (1:3.0.2p1-1) unstable; urgency=high
4920
4921 * Incorporate fix from Colin's NMU
4922 * New upstream version (fixes the bug Wichert fixed) (Closes: #124035)
4923 * Capitalise IETF (Closes: #125379)
4924 * Refer to the correct sftp-server location (Closes: #126854, #126224)
4925 * Do what we're asked re SetUID ssh (Closes: #124065, #124154, #123247)
4926 * Ask people upgrading from potato if they want a new conffile
4927 (Closes: #125642)
4928 * Fix a typo in postinst (Closes: #122192, #122410, #123440)
4929 * Frob the default config a little (Closes: #122284, #125827, #125696,
4930 #123854)
4931 * Make /etc/init.d/ssh be more clear about ssh not running (Closes:
4932 #123552)
4933 * Fix typo in templates file (Closes: #123411)
4934
4935 -- Matthew Vernon <matthew@debian.org> Fri, 4 Jan 2002 16:01:52 +0000
4936
4937openssh (1:3.0.1p1-1.2) unstable; urgency=high
4938
4939 * Non-maintainer upload
4940 * Prevent local users from passing environment variables to the login
4941 process when UseLogin is enabled
4942
4943 -- Wichert Akkerman <wakkerma@debian.org> Mon, 3 Dec 2001 19:34:45 +0100
4944
4945openssh (1:3.0.1p1-1.1) unstable; urgency=low
4946
4947 * Non-maintainer upload, at Matthew's request.
4948 * Remove sa_restorer assignment to fix compilation on alpha, hppa, and
4949 ia64 (closes: #122086).
4950
4951 -- Colin Watson <cjwatson@debian.org> Sun, 2 Dec 2001 18:54:16 +0000
4952
4953openssh (1:3.0.1p1-1) unstable; urgency=high
4954
4955 * New upstream version (Closes: #113646, #113513, #114707, #118564)
4956 * Building with a libc that works (!) (Closes: #115228)
4957 * Patches forward-ported are -1/-2 options for scp, the improvement to
4958 'waiting for forwarded connections to terminate...'
4959 * Fix /etc/init.d/ssh to stop sshd properly (Closes: #115228)
4960 * /etc/ssh/sshd_config is no longer a conffile but generated in the postinst
4961 * Remove suidregister leftover from postrm
4962 * Mention key we are making in the postinst
4963 * Default to not enable SSH protocol 1 support, since protocol 2 is
4964 much safer anyway.
4965 * New version of the vpn-fixes patch, from Ian Jackson
4966 * New handling of -q, and added new -qq option; thanks to Jon Amery
4967 * Experimental smartcard support not enabled, since I have no way of
4968 testing it.
4969
4970 -- Matthew Vernon <matthew@debian.org> Thu, 28 Nov 2001 17:43:01 +0000
4971
4972openssh (1:2.9p2-6) unstable; urgency=low
4973
4974 * check for correct file in /etc/init.d/ssh (Closes: #110876)
4975 * correct location of version 2 keys in ssh.1 (Closes: #110439)
4976 * call update-alternatives --quiet (Closes: #103314)
4977 * hack ssh-copy-id to chmod go-w (Closes: #95551)
4978 * TEMPORARY fix to provide largefile support using a -D in the cflags
4979 line. long-term, upstream will patch the autoconf stuff
4980 (Closes: #106809, #111849)
4981 * remove /etc/rc references in ssh-keygen.1 (Closes: #68350)
4982 * scp.1 patch from Adam McKenna to document -r properly (Closes: #76054)
4983 * Check for files containing a newline character (Closes: #111692)
4984
4985 -- Matthew Vernon <matthew@debian.org> Thu, 13 Sep 2001 16:47:36 +0100
4986
4987openssh (1:2.9p2-5) unstable; urgency=high
4988
4989 * Thanks to all the bug-fixers who helped!
4990 * remove sa_restorer assignment (Closes: #102837)
4991 * patch from Peter Benie to DTRT wrt X forwarding if the server refuses
4992 us access (Closes: #48297)
4993 * patch from upstream CVS to fix port forwarding (Closes: #107132)
4994 * patch from Jonathan Amery to document ssh-keygen behaviour
4995 (Closes:#106643, #107512)
4996 * patch to postinst from Jonathan Amery (Closes: #106411)
4997 * patch to manpage from Jonathan Amery (Closes: #107364)
4998 * patch from Matthew Vernon to make -q emit fatal errors as that is the
4999 documented behaviour (Closes: #64347)
5000 * patch from Ian Jackson to cause us to destroy a file when we scp it
5001 onto itself, rather than dumping bits of our memory into it, which was
5002 a security hole (see #51955)
5003 * patch from Jonathan Amery to document lack of Kerberos support
5004 (Closes: #103726)
5005 * patch from Matthew Vernon to make the 'waiting for connections to
5006 terminate' message more helpful (Closes: #50308)
5007
5008 -- Matthew Vernon <matthew@debian.org> Thu, 23 Aug 2001 02:14:09 +0100
5009
5010openssh (1:2.9p2-4) unstable; urgency=high
5011
5012 * Today's build of ssh is strawberry flavoured
5013 * Patch from mhp to reduce length of time sshd is stopped for (Closes: #106176)
5014 * Tidy up debconf template (Closes: #106152)
5015 * If called non-setuid, then setgid()'s failure should not be fatal (see
5016 #105854)
5017
5018 -- Matthew Vernon <matthew@debian.org> Sun, 22 Jul 2001 14:19:43 +0100
5019
5020openssh (1:2.9p2-3) unstable; urgency=low
5021
5022 * Patch from yours truly to add -1 and -2 options to scp (Closes: #106061)
5023 * Improve the IdentityFile section in the man page (Closes: #106038)
5024
5025 -- Matthew Vernon <matthew@debian.org> Sat, 21 Jul 2001 14:47:27 +0100
5026
5027openssh (1:2.9p2-2) unstable; urgency=low
5028
5029 * Document the protocol version 2 and IPV6 changes (Closes: #105845, #105868)
5030 * Make PrintLastLog 'no' by default (Closes: #105893)
5031
5032 -- Matthew Vernon <matthew@debian.org> Thu, 19 Jul 2001 18:36:41 +0100
5033
5034openssh (1:2.9p2-1) unstable; urgency=low
5035
5036 * new (several..) upstream version (Closes: #96726, #81856, #96335)
5037 * Hopefully, this will close some other bugs too
5038
5039 -- Matthew Vernon <matthew@debian.org> Tue, 17 Jul 2001 19:41:58 +0100
5040
5041openssh (1:2.5.2p2-3) unstable; urgency=low
5042
5043 * Taking Over this package
5044 * Patches from Robert Bihlmeyer for the Hurd (Closes: #102991)
5045 * Put PermitRootLogin back to yes (Closes: #67334, #67371, #78274)
5046 * Don't fiddle with conf-files any more (Closes: #69501)
5047
5048 -- Matthew Vernon <matthew@debian.org> Tue, 03 Jul 2001 02:58:13 +0100
5049
5050openssh (1:2.5.2p2-2.2) unstable; urgency=low
5051
5052 * NMU
5053 * Include Hurd compatibility patches from Robert Bihlmeyer (Closes: #76033)
5054 * Patch from Richard Kettlewell for protocolkeepalives (Closes: #99273)
5055 * Patch from Matthew Vernon for BannerTimeOut, batchmode, and
5056 documentation for protocolkeepalives. Makes ssh more generally useful
5057 for scripting uses (Closes: #82877, #99275)
5058 * Set a umask, so ourpidfile isn't world-writable (closes: #100012,
5059 #98286, #97391)
5060
5061 -- Matthew Vernon <matthew@debian.org> Thu, 28 Jun 2001 23:15:42 +0100
5062
5063openssh (1:2.5.2p2-2.1) unstable; urgency=low
5064
5065 * NMU
5066 * Remove duplicate Build-Depends for libssl096-dev and change it to
5067 depend on libssl-dev instaed. Also adding in virtual | real package
5068 style build-deps. (Closes: #93793, #75228)
5069 * Removing add-log entry (Closes: #79266)
5070 * This was a pam bug from a while back (Closes: #86908, #88457, #86843)
5071 * pam build-dep already exists (Closes: #93683)
5072 * libgnome-dev build-dep already exists (Closes: #93694)
5073 * No longer in non-free (Closes: #85401)
5074 * Adding in fr debconf translations (Closes: #83783)
5075 * Already suggests xbase-clients (Closes: #79741)
5076 * No need to suggest libpam-pwdb anymore (Closes: #81658)
5077 * Providing rsh-client (Closes: #79437)
5078 * hurd patch was already applied (Closes: #76033)
5079 * default set to no (Closes: #73682)
5080 * Adding in a suggests for dnsutils (Closes: #93265)
5081 * postinst bugs fixed (Closes: #88057, #88066, #88196, #88405, #88612)
5082 (Closes: #88774, #88196, #89556, #90123, #90228, #90833, #87814, #85465)
5083 * Adding in debconf dependency
5084
5085 -- Ivan E. Moore II <rkrusty@debian.org> Mon, 16 Apr 2001 14:11:04 +0100
5086
5087openssh (1:2.5.2p2-2) unstable; urgency=high
5088
5089 * disable the OpenSSL version check in entropy.c
5090 (closes: #93581, #93588, #93590, #93614, #93619, #93635, #93648)
5091
5092 -- Philip Hands <phil@uk.alcove.com> Wed, 11 Apr 2001 20:30:04 +0100
5093
5094openssh (1:2.5.2p2-1) unstable; urgency=low
5095
5096 * New upstream release
5097 * removed make-ssh-known-hosts, since ssh-keyscan does that job (closes: #86069, #87748)
5098 * fix double space indent in german templates (closes: #89493)
5099 * make postinst check for ssh_host_rsa_key
5100 * get rid of the last of the misguided debian/rules NMU debris :-/
5101
5102 -- Philip Hands <phil@hands.com> Sat, 24 Mar 2001 20:59:33 +0000
5103
5104openssh (1:2.5.1p2-2) unstable; urgency=low
5105
5106 * rebuild with new debhelper (closes: #89558, #89536, #90225)
5107 * fix broken dpkg-statoverride test in postinst
5108 (closes: #89612, #90474, #90460, #89605)
5109 * NMU bug fixed but not closed in last upload (closes: #88206)
5110
5111 -- Philip Hands <phil@hands.com> Fri, 23 Mar 2001 16:11:33 +0000
5112
5113openssh (1:2.5.1p2-1) unstable; urgency=high
5114
5115 * New upstream release
5116 * fix typo in postinst (closes: #88110)
5117 * revert to setting PAM service name in debian/rules, backing out last
5118 NMU, which also (closes: #88101)
5119 * restore the pam lastlog/motd lines, lost during the NMUs, and sshd_config
5120 * restore printlastlog option patch
5121 * revert to using debhelper, which had been partially disabled in NMUs
5122
5123 -- Philip Hands <phil@hands.com> Tue, 13 Mar 2001 01:41:34 +0000
5124
5125openssh (1:2.5.1p1-1.8) unstable; urgency=high
5126
5127 * And now the old pam-bug s/sshd/ssh in ssh.c is also fixed
5128
5129 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 19:48:01 +0100
5130
5131openssh (1:2.5.1p1-1.7) unstable; urgency=high
5132
5133 * And now we mark the correct binary as setuid, when a user requested
5134 to install it setuid.
5135
5136 -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 07:19:56 +0100
5137
5138openssh (1:2.5.1p1-1.6) unstable; urgency=high
5139
5140 * Fixes postinst to handle overrides that are already there. Damn, I
5141 should have noticed the bug earlier.
5142
5143 -- Christian Kurz <shorty@debian.org> Wed, 28 Feb 2001 22:35:00 +0100
5144
5145openssh (1:2.5.1p1-1.5) unstable; urgency=high
5146
5147 * Rebuild ssh with pam-support.
5148
5149 -- Christian Kurz <shorty@debian.org> Mon, 26 Feb 2001 21:55:51 +0100
5150
5151openssh (1:2.5.1p1-1.4) unstable; urgency=low
5152
5153 * Added Build-Depends on libssl096-dev.
5154 * Fixed sshd_config file to disallow root logins again.
5155
5156 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 20:03:55 +0100
5157
5158openssh (1:2.5.1p1-1.3) unstable; urgency=low
5159
5160 * Fixed missing manpages for sftp.1 and ssh-keyscan.1
5161 * Made package policy 3.5.2 compliant.
5162
5163 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 15:46:26 +0100
5164
5165openssh (1:2.5.1p1-1.2) unstable; urgency=low
5166
5167 * Added Conflict with sftp, since we now provide our own sftp-client.
5168 * Added a fix for our broken dpkg-statoverride call in the
5169 2.3.0p1-13.
5170 * Fixed some config pathes in the comments of sshd_config.
5171 * Removed ssh-key-exchange-vulnerability-patch since it's not needed
5172 anymore because upstream included the fix.
5173
5174 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 13:46:58 +0100
5175
5176openssh (1:2.5.1p1-1.1) unstable; urgency=high
5177
5178 * Another NMU to get the new upstream version 2.5.1p1 into
5179 unstable. (Closes: #87123)
5180 * Corrected postinst to mark ssh as setuid. (Closes: #86391, #85766)
5181 * Key Exchange patch is already included by upstream. (Closes: #86015)
5182 * Upgrading should be possible now. (Closes: #85525, #85523)
5183 * Added --disable-suid-ssh as compile option, so ssh won't get installed
5184 suid per default.
5185 * Fixed postinst to run dpkg-statoverride only, when dpkg-statoverride
5186 is available and the mode of the binary should be 4755. And also added
5187 suggestion for a newer dpkg.
5188 (Closes: #85734, #85741, #86876)
5189 * sftp and ssh-keyscan will also be included from now on. (Closes: #79994)
5190 * scp now understands spaces in filenames (Closes: #53783, #58958,
5191 #66723)
5192 * ssh-keygen now supports showing DSA fingerprints. (Closes: #68623)
5193 * ssh doesn' t show motd anymore when switch -t is used. (Closes #69035)
5194 * ssh supports the usage of other dsa keys via the ssh command line
5195 options. (Closes: #81250)
5196 * Documentation in sshd_config fixed. (Closes: #81088)
5197 * primes file included by upstream and included now. (Closes: #82101)
5198 * scp now allows dots in the username. (Closes: #82477)
5199 * Spelling error in ssh-copy-id.1 corrected by upstream. (Closes: #78124)
5200
5201 -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 10:06:08 +0100
5202
5203openssh (1:2.3.0p1-1.13) unstable; urgency=low
5204
5205 * Config should now also be fixed with this hopefully last NMU.
5206
5207 -- Christian Kurz <shorty@debian.org> Sat, 10 Feb 2001 22:56:36 +0100
5208
5209openssh (1:2.3.0p1-1.12) unstable; urgency=high
5210
5211 * Added suggest for xbase-clients to control-file. (Closes #85227)
5212 * Applied patch from Markus Friedl to fix a vulnerability in
5213 the rsa keyexchange.
5214 * Fixed position of horizontal line. (Closes: #83613)
5215 * Fixed hopefully the grep problem in the config-file. (Closes: #78802)
5216 * Converted package from suidregister to dpkg-statoverride.
5217
5218 -- Christian Kurz <shorty@debian.org> Fri, 9 Feb 2001 19:43:55 +0100
5219
5220openssh (1:2.3.0p1-1.11) unstable; urgency=medium
5221
5222 * Fixed some typos in the german translation of the debconf
5223 template.
5224
5225 -- Christian Kurz <shorty@debian.org> Wed, 24 Jan 2001 18:22:38 +0100
5226
5227openssh (1:2.3.0p1-1.10) unstable; urgency=medium
5228
5229 * Fixed double printing of motd. (Closes: #82618)
5230
5231 -- Christian Kurz <shorty@debian.org> Tue, 23 Jan 2001 21:03:43 +0100
5232
5233openssh (1:2.3.0p1-1.9) unstable; urgency=high
5234
5235 * And the next NMU which includes the patch from Andrew Bartlett
5236 and Markus Friedl to fix the root privileges handling of openssh.
5237 (Closes: #82657)
5238
5239 -- Christian Kurz <shorty@debian.org> Wed, 17 Jan 2001 22:20:54 +0100
5240
5241openssh (1:2.3.0p1-1.8) unstable; urgency=high
5242
5243 * Applied fix from Ryan Murray to allow building on other architectures
5244 since the hurd patch was wrong. (Closes: #82471)
5245
5246 -- Christian Kurz <shorty@debian.org> Tue, 16 Jan 2001 22:45:51 +0100
5247
5248openssh (1:2.3.0p1-1.7) unstable; urgency=medium
5249
5250 * Fixed another typo on sshd_config
5251
5252 -- Christian Kurz <shorty@debian.org> Sun, 14 Jan 2001 19:01:31 +0100
5253
5254openssh (1:2.3.0p1-1.6) unstable; urgency=high
5255
5256 * Added Build-Dependency on groff (Closes: #81886)
5257 * Added Build-Depencency on debhelper (Closes: #82072)
5258 * Fixed entry for known_hosts in sshd_config (Closes: #82096)
5259
5260 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 23:08:16 +0100
5261
5262openssh (1:2.3.0p1-1.5) unstable; urgency=high
5263
5264 * Fixed now also the problem with sshd used as default ipv4 and
5265 didn't use IPv6. This should be now fixed.
5266
5267 -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 21:25:55 +0100
5268
5269openssh (1:2.3.0p1-1.4) unstable; urgency=high
5270
5271 * Fixed buggy entry in postinst.
5272
5273 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 23:12:16 +0100
5274
5275openssh (1:2.3.0p1-1.3) unstable; urgency=high
5276
5277 * After finishing the rewrite of the rules-file I had to notice that
5278 the manpage installation was broken. This should now work again.
5279
5280 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 22:11:59 +0100
5281
5282openssh (1:2.3.0p1-1.2) unstable; urgency=high
5283
5284 * Fixed the screwed up build-dependency.
5285 * Removed --with-ipv4-default to support ipv6.
5286 * Changed makefile to use /etc/pam.d/ssh instead of /etc/pam.d/sshd.
5287 * Fixed location to sftp-server in config.
5288 * Since debian still relies on /etc/pam.d/ssh instead of moving to
5289 /etc/pam.d/sshd, I had to hack ssh.h to get ssh to use this name.
5290 * Fixed path to host key in sshd_config.
5291
5292 -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 08:23:47 +0100
5293
5294openssh (1:2.3.0p1-1.1) unstable; urgency=medium
5295
5296 * NMU with permission of Phil Hands.
5297 * New upstream release
5298 * Update Build-Depends to point to new libssl096.
5299 * This upstream release doesn't leak any information depending
5300 on the setting of PermitRootLogin (Closes: #59933)
5301 * New upstream release contains fix against forcing a client to
5302 do X/agent forwarding (Closes: #76788)
5303 * Changed template to contain correct path to the documentation
5304 (Closes: #67245)
5305 * Added --with-4in6 switch as compile option into debian/rules.
5306 * Added --with-ipv4-default as compile option into debian/rules.
5307 (Closes: #75037)
5308 * Changed default path to also contain /usr/local/bin and
5309 /usr/X11R6/bin (Closes: #62472,#54567,#62810)
5310 * Changed path to sftp-server in sshd_config to match the
5311 our package (Closes: #68347)
5312 * Replaced OpenBSDh with OpenBSD in the init-script.
5313 * Changed location to original source in copyright.head
5314 * Changed behaviour of init-script when invoked with the option
5315 restart (Closes: #68706,#72560)
5316 * Added a note about -L option of scp to README.Debian
5317 * ssh won't print now the motd if invoked with -t option
5318 (Closes: #59933)
5319 * RFC.nroff.gz get's now converted into RFC.gz. (Closes: #63867)
5320 * Added a note about tcp-wrapper support to README.Debian
5321 (Closes: #72807,#22190)
5322 * Removed two unneeded options from building process.
5323 * Added sshd.pam into debian dir and install it.
5324 * Commented out unnecessary call to dh_installinfo.
5325 * Added a line to sshd.pam so that limits will be paid attention
5326 to (Closes: #66904)
5327 * Restart Option has a Timeout of 10 seconds (Closes: 51264)
5328 * scp won't override files anymore (Closes: 51955)
5329 * Removed pam_lastlog module, so that the lastlog is now printed
5330 only once (Closes: #71742, #68335, #69592, #71495, #77781)
5331 * If password is expired, openssh now forces the user to change it.
5332 (Closes: #51747)
5333 * scp should now have no more problems with shell-init-files that
5334 produces ouput (Closes: #56280,#59873)
5335 * ssh now prints the motd correctly (Closes: #66926)
5336 * ssh upgrade should disable ssh daemon only if users has choosen
5337 to do so (Closes: #67478)
5338 * ssh can now be installed suid (Closes: #70879)
5339 * Modified debian/rules to support hurd.
5340
5341 -- Christian Kurz <shorty@debian.org> Wed, 27 Dec 2000 20:06:57 +0100
5342
5343openssh (1:2.2.0p1-1.1) unstable; urgency=medium
5344
5345 * Non-Maintainer Upload
5346 * Check for new returns in the new libc
5347 (closes: #72803, #74393, #72797, #71307, #71702)
5348 * Link against libssl095a (closes: #66304)
5349 * Correct check for PermitRootLogin (closes: #69448)
5350
5351 -- Ryan Murray <rmurray@debian.org> Wed, 18 Oct 2000 00:48:18 -0700
5352
5353openssh (1:2.2.0p1-1) unstable; urgency=low
5354
5355 * New upstream release
5356
5357 -- Philip Hands <phil@hands.com> Mon, 11 Sep 2000 14:49:43 +0100
5358
5359openssh (1:2.1.1p4-3) unstable; urgency=low
5360
5361 * add rsh alternatives
5362 * add -S option to scp (using Tommi Virtanen's patch) (closes: #63097)
5363 * do the IPV4_DEFAULT thing properly this time
5364
5365 -- Philip Hands <phil@hands.com> Fri, 11 Aug 2000 18:14:37 +0100
5366
5367openssh (1:2.1.1p4-2) unstable; urgency=low
5368
5369 * reinstate manpage .out patch from 1:1.2.3
5370 * fix typo in postinst
5371 * only compile ssh with IPV4_DEFAULT
5372 * apply James Troup's patch to add a -o option to scp and updated manpage
5373
5374 -- Philip Hands <phil@hands.com> Sun, 30 Jul 2000 00:12:49 +0100
5375
5376openssh (1:2.1.1p4-1) unstable; urgency=low
5377
5378 * New upstream release
5379
5380 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 14:46:16 +0100
5381
5382openssh (1:1.2.3-10) unstable; urgency=low
5383
5384 * add version to libpam-modules dependency, because old versions of
5385 pam_motd make it impossible to log in.
5386
5387 -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 13:28:22 +0100
5388
5389openssh (1:1.2.3-9) frozen unstable; urgency=low
5390
5391 * force location of /usr/bin/X11/xauth
5392 (closes: #64424, #66437, #66859) *RC*
5393 * typos in config (closes: #66779, #66780)
5394 * sshd_not_to_be_run could be assumed to be true, in error, if the config
5395 script died in an unusual way --- I've reversed this (closes: #66335)
5396 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to ssh-askpass-ptk
5397 (closes: #65981)
5398 * change default for PermitRootLogin to "no" (closes: #66406)
5399
5400 -- Philip Hands <phil@hands.com> Tue, 11 Jul 2000 20:51:18 +0100
5401
5402openssh (1:1.2.3-8) frozen unstable; urgency=low
5403
5404 * get rid of Provides: rsh-server (this will mean that rstartd
5405 will need to change it's depends to deal with #63948, which I'm
5406 reopening) (closes: #66257)
5407 Given that this is also a trivial change, and is a reversal of a
5408 change that was mistakenly made after the freeze, I think this should
5409 also go into frozen.
5410
5411 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:26:30 +0100
5412
5413openssh (1:1.2.3-7) frozen unstable; urgency=low
5414
5415 * check if debconf is installed before calling db_stop in postinst.
5416 This is required to allow ssh to be installed when debconf is not
5417 wanted, which probably makes it an RC upload (hopefully the last of
5418 too many).
5419
5420 -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:19:47 +0100
5421
5422openssh (1:1.2.3-6) frozen unstable; urgency=low
5423
5424 * fixed depressing little bug involving a line wrap looking like
5425 a blank line in the templates file *RC*
5426 (closes: #66090, #66078, #66083, #66182)
5427
5428 -- Philip Hands <phil@hands.com> Mon, 26 Jun 2000 00:45:05 +0100
5429
5430openssh (1:1.2.3-5) frozen unstable; urgency=low
5431
5432 * add code to prevent UseLogin exploit, although I think our PAM
5433 conditional code breaks UseLogin in a way that protects us from this
5434 exploit anyway. ;-) (closes: #65495) *RC*
5435 * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to fix keyboard
5436 grab vulnerability in ssh-askpass-gnome (closes: #64795) *RC*
5437 * stop redirection of sshd's file descriptors (introduced in 1:1.2.3-3)
5438 and use db_stop in the postinst to solve that problem instead
5439 (closes: #65104)
5440 * add Provides: rsh-server to ssh (closes: #63948)
5441 * provide config option not to run sshd
5442
5443 -- Philip Hands <phil@hands.com> Mon, 12 Jun 2000 23:05:11 +0100
5444
5445openssh (1:1.2.3-4) frozen unstable; urgency=low
5446
5447 * fixes #63436 which is *RC*
5448 * add 10 second pause in init.d restart (closes: #63844)
5449 * get rid of noenv in PAM mail line (closes: #63856)
5450 * fix host key path in make-ssh-known-hosts (closes: #63713)
5451 * change wording of SUID template (closes: #62788, #63436)
5452
5453 -- Philip Hands <phil@hands.com> Sat, 27 May 2000 11:18:06 +0100
5454
5455openssh (1:1.2.3-3) frozen unstable; urgency=low
5456
5457 * redirect sshd's file descriptors to /dev/null in init to
5458 prevent debconf from locking up during installation
5459 ** grave bug just submited by me **
5460
5461 -- Philip Hands <phil@hands.com> Thu, 20 Apr 2000 17:10:59 +0100
5462
5463openssh (1:1.2.3-2) frozen unstable; urgency=low
5464
5465 * allow user to select SUID status of /usr/bin/ssh (closes: 62462) ** RC **
5466 * suggest debconf
5467 * conflict with debconf{,-tiny} (<<0.2.17) so I can clean up the preinst
5468
5469 -- Philip Hands <phil@hands.com> Wed, 19 Apr 2000 17:49:15 +0100
5470
5471openssh (1:1.2.3-1) frozen unstable; urgency=low
5472
5473 * New upstream release
5474 * patch sshd to create extra xauth key required for localhost
5475 (closes: #49944) *** RC ***
5476 * FallbacktoRsh now defaults to ``no'' to match impression
5477 given in sshd_config
5478 * stop setting suid bit on ssh (closes: #58711, #58558)
5479 This breaks Rhosts authentication (which nobody uses) and allows
5480 the LD_PRELOAD trick to get socks working, so seems like a net benefit.
5481
5482 -- Philip Hands <phil@hands.com> Thu, 13 Apr 2000 20:01:54 +0100
5483
5484openssh (1:1.2.2-1.4) frozen unstable; urgency=low
5485
5486 * Recompile for frozen, contains fix for RC bug.
5487
5488 -- Tommi Virtanen <tv@debian.org> Tue, 29 Feb 2000 22:14:58 +0200
5489
5490openssh (1:1.2.2-1.3) unstable; urgency=low
5491
5492 * Integrated man page addition for PrintLastLog.
5493 This bug was filed on "openssh", and I ended up
5494 creating my own patch for this (closes: #59054)
5495 * Improved error message when ssh_exchange_identification
5496 gets EOF (closes: #58904)
5497 * Fixed typo (your -> you're) in debian/preinst.
5498 * Added else-clauses to config to make this upgradepath possible:
5499 oldssh -> openssh preinst fails due to upgrade_to_openssh=false
5500 -> ssh-nonfree -> openssh. Without these, debconf remembered
5501 the old answer, config didn't force asking it, and preinst always
5502 aborted (closes: #56596, #57782)
5503 * Moved setting upgrade_to_openssh isdefault flag to the place
5504 where preinst would abort. This means no double question to most
5505 users, people who currently suffer from "can't upgrade" may need
5506 to run apt-get install ssh twice. Did not do the same for
5507 use_old_init_script, as the situation is a bit different, and
5508 less common (closes: #54010, #56224)
5509 * Check for existance of ssh-keygen before attempting to use it in
5510 preinst, added warning for non-existant ssh-keygen in config. This
5511 happens when the old ssh is removed (say, due to ssh-nonfree getting
5512 installed).
5513
5514 -- Tommi Virtanen <tv@debian.org> Sun, 27 Feb 2000 21:36:43 +0200
5515
5516openssh (1:1.2.2-1.2) frozen unstable; urgency=low
5517
5518 * Non-maintainer upload.
5519 * Added configuration option PrintLastLog, default off due to PAM
5520 (closes: #54007, #55042)
5521 * ssh-askpass-{gnome,ptk} now provide ssh-askpass, making ssh's
5522 Suggests: line more accurate. Also closing related bugs fixed
5523 earlier, when default ssh-askpass moved to /usr/bin.
5524 (closes: #52403, #54741, #50607, #52298, #50967, #51661)
5525 * Patched to call vhangup, with autoconf detection and all
5526 (closes: #55379)
5527 * Added --with-ipv4-default workaround to a glibc bug causing
5528 slow DNS lookups, as per UPGRADING. Use -6 to really use
5529 IPv6 addresses. (closes: #57891, #58744, #58713, #57970)
5530 * Added noenv to PAM pam_mail line. Thanks to Ben Collins.
5531 (closes: #58429)
5532 * Added the UPGRADING file to the package.
5533 * Added frozen to the changelog line and recompiled before
5534 package was installed into the archive.
5535
5536 -- Tommi Virtanen <tv@debian.org> Fri, 25 Feb 2000 22:08:57 +0200
5537
5538openssh (1:1.2.2-1.1) frozen unstable; urgency=low
5539
5540 * Non-maintainer upload.
5541 * Integrated scp pipe buffer patch from Ben Collins
5542 <benc@debian.org>, should now work even if reading
5543 a pipe gives less than fstat st_blksize bytes.
5544 Should now work on Alpha and Sparc Linux (closes: #53697, #52071)
5545 * Made ssh depend on libssl09 (>= 0.9.4-3) (closes: #51393)
5546 * Integrated patch from Ben Collins <benc@debian.org>
5547 to do full shadow account locking and expiration
5548 checking (closes: #58165, #51747)
5549
5550 -- Tommi Virtanen <tv@debian.org> Tue, 22 Feb 2000 20:46:12 +0200
5551
5552openssh (1:1.2.2-1) frozen unstable; urgency=medium
5553
5554 * New upstream release (closes: #56870, #56346)
5555 * built against new libesd (closes: #56805)
5556 * add Colin Watson <cjw44@cam.ac.uk> =NULL patch
5557 (closes: #49902, #54894)
5558 * use socketpairs as suggested by Andrew Tridgell to eliminate rsync
5559 (and other) lockups
5560 * patch SSHD_PAM_SERVICE back into auth-pam.c, again :-/
5561 (closes: #49902, #55872, #56959)
5562 * uncoment the * line in ssh_config (closes: #56444)
5563
5564 * #54894 & #49902 are release critical, so this should go in frozen
5565
5566 -- Philip Hands <phil@hands.com> Wed, 9 Feb 2000 04:52:04 +0000
5567
5568openssh (1:1.2.1pre24-1) unstable; urgency=low
5569
5570 * New upstream release
5571
5572 -- Philip Hands <phil@hands.com> Fri, 31 Dec 1999 02:47:24 +0000
5573
5574openssh (1:1.2.1pre23-1) unstable; urgency=low
5575
5576 * New upstream release
5577 * excape ? in /etc/init.d/ssh (closes: #53269)
5578
5579 -- Philip Hands <phil@hands.com> Wed, 29 Dec 1999 16:50:46 +0000
5580
5581openssh (1:1.2pre17-1) unstable; urgency=low
5582
5583 * New upstream release
5584
5585 -- Philip Hands <phil@hands.com> Thu, 9 Dec 1999 16:50:40 +0000
5586
5587openssh (1:1.2pre16-1) unstable; urgency=low
5588
5589 * New upstream release
5590 * upstream release (1.2pre14) (closes: #50299)
5591 * make ssh depend on libwrap0 (>= 7.6-1.1) (closes: #50973, #50776)
5592 * dispose of grep -q broken pipe message in config script (closes: #50855)
5593 * add make-ssh-known-hosts (closes: #50660)
5594 * add -i option to ssh-copy-id (closes: #50657)
5595 * add check for *LK* in password, indicating a locked account
5596
5597 -- Philip Hands <phil@hands.com> Wed, 8 Dec 1999 22:59:38 +0000
5598
5599openssh (1:1.2pre13-1) unstable; urgency=low
5600
5601 * New upstream release
5602 * make sshd.c use SSHD_PAM_SERVICE and define it as "ssh" in debian/rules
5603 * remove duplicate line in /etc/pam.d/ssh (closes: #50310)
5604 * mention ssh -A option in ssh.1 & ssh_config
5605 * enable forwarding to localhost in default ssh_config (closes: #50373)
5606 * tweak preinst to deal with debconf being `unpacked'
5607 * use --with-tcp-wrappers (closes: #49545)
5608
5609 -- Philip Hands <phil@hands.com> Sat, 20 Nov 1999 14:20:04 +0000
5610
5611openssh (1:1.2pre11-2) unstable; urgency=low
5612
5613 * oops, just realised that I forgot to strip out the unpleasant
5614 fiddling mentioned below (which turned not to be a fix anyway)
5615
5616 -- Philip Hands <phil@hands.com> Mon, 15 Nov 1999 01:35:23 +0000
5617
5618openssh (1:1.2pre11-1) unstable; urgency=low
5619
5620 * New upstream release (closes: #49722)
5621 * add 2>/dev/null to dispose of spurious message casused by grep -q
5622 (closes: #49876, #49604)
5623 * fix typo in debian/control (closes: #49841)
5624 * Do some unpleasant fiddling with upgraded keys in the preinst, which
5625 should make the keylength problem go away. (closes: #49676)
5626 * make pam_start in sshd use ``ssh'' as the service name (closes: #49956)
5627 * If /etc/ssh/NOSERVER exist, stop sshd from starting (closes: #47107)
5628 * apply Ben Collins <bcollins@debian.org>'s shadow patch
5629 * disable lastlogin and motd printing if using pam (closes: #49957)
5630 * add ssh-copy-id script and manpage
5631
5632 -- Philip Hands <phil@hands.com> Fri, 12 Nov 1999 01:03:38 +0000
5633
5634openssh (1:1.2pre9-1) unstable; urgency=low
5635
5636 * New upstream release
5637 * apply Chip Salzenberg <chip@valinux.com>'s SO_REUSEADDR patch
5638 to channels.c, to make forwarded ports instantly reusable
5639 * replace Pre-Depend: debconf with some check code in preinst
5640 * make the ssh-add ssh-askpass failure message more helpful
5641 * fix the ssh-agent getopts bug (closes: #49426)
5642 * fixed typo on Suggests: line (closes: #49704, #49571)
5643 * tidy up ssh package description (closes: #49642)
5644 * make ssh suid (closes: #49635)
5645 * in preinst upgrade code, ensure ssh_host_keys is mode 600 (closes: #49606)
5646 * disable agent forwarding by default, for the similar reasons as
5647 X forwarding (closes: #49586)
5648
5649 -- Philip Hands <phil@hands.com> Tue, 9 Nov 1999 09:57:47 +0000
5650
5651openssh (1:1.2pre7-4) unstable; urgency=low
5652
5653 * predepend on debconf (>= 0.2.17) should now allow preinst questions
5654
5655 -- Philip Hands <phil@hands.com> Sat, 6 Nov 1999 10:31:06 +0000
5656
5657openssh (1:1.2pre7-3) unstable; urgency=low
5658
5659 * add ssh-askpass package using Tommi Virtanen's perl-tk script
5660 * add ssh-preconfig package cludge
5661 * add usage hints to ssh-agent.1
5662
5663 -- Philip Hands <phil@hands.com> Fri, 5 Nov 1999 00:38:33 +0000
5664
5665openssh (1:1.2pre7-2) unstable; urgency=low
5666
5667 * use pam patch from Ben Collins <bcollins@debian.org>
5668 * add slogin symlink to Makefile.in
5669 * change /usr/bin/login to LOGIN_PROGRAM define of /bin/login
5670 * sort out debconf usage
5671 * patch from Tommi Virtanen <tv@debian.org>'s makes ssh-add use ssh-askpass
5672
5673 -- Philip Hands <phil@hands.com> Thu, 4 Nov 1999 11:08:54 +0000
5674
5675openssh (1:1.2pre7-1) unstable; urgency=low
5676
5677 * New upstream release
5678
5679 -- Philip Hands <phil@hands.com> Tue, 2 Nov 1999 21:02:37 +0000
5680
5681openssh (1:1.2.0.pre6db1-2) unstable; urgency=low
5682
5683 * change the binary package name to ssh (the non-free branch of ssh has
5684 been renamed to ssh-nonfree)
5685 * make pam file comply with Debian standards
5686 * use an epoch to make sure openssh supercedes ssh-nonfree
5687
5688 -- Philip Hands <phil@hands.com> Sat, 30 Oct 1999 16:26:05 +0100
5689
5690openssh (1.2pre6db1-1) unstable; urgency=low
5691
5692 * New upstream source
5693 * sshd accepts logins now!
5694
5695 -- Dan Brosemer <odin@linuxfreak.com> Fri, 29 Oct 1999 11:13:38 -0500
5696
5697openssh (1.2.0.19991028-1) unstable; urgency=low
5698
5699 * New upstream source
5700 * Added test for -lnsl to configure script
5701
5702 -- Dan Brosemer <odin@linuxfreak.com> Thu, 28 Oct 1999 18:52:09 -0500
5703
5704openssh (1.2.0.19991027-3) unstable; urgency=low
5705
5706 * Initial release
5707
5708 -- 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/control b/debian/control
new file mode 100644
index 000000000..9b0bba2bb
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,237 @@
1Source: openssh
2Section: net
3Priority: standard
4Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
5Build-Depends: autotools-dev,
6 debhelper (>= 9.20160709~),
7 debhelper-compat (= 9),
8 dh-autoreconf,
9 dh-exec,
10 dh-runit (>= 2.8.8),
11 dpkg-dev (>= 1.16.1~),
12 libaudit-dev [linux-any],
13 libedit-dev,
14 libgtk-3-dev <!pkg.openssh.nognome>,
15 libkrb5-dev | heimdal-dev,
16 libpam0g-dev | libpam-dev,
17 libselinux1-dev [linux-any],
18 libssl-dev (>= 1.1.0g),
19 libsystemd-dev [linux-any],
20 libwrap0-dev | libwrap-dev,
21 pkg-config,
22 zlib1g-dev (>= 1:1.2.3),
23Standards-Version: 4.1.0
24Uploaders: Colin Watson <cjwatson@debian.org>,
25 Matthew Vernon <matthew@debian.org>,
26Homepage: http://www.openssh.com/
27Vcs-Git: https://salsa.debian.org/ssh-team/openssh.git
28Vcs-Browser: https://salsa.debian.org/ssh-team/openssh
29
30Package: openssh-client
31Architecture: any
32Depends: adduser (>= 3.10),
33 dpkg (>= 1.7.0),
34 passwd,
35 ${misc:Depends},
36 ${shlibs:Depends},
37Recommends: xauth,
38Conflicts: sftp,
39Replaces: ssh,
40 ssh-krb5,
41Suggests: keychain,
42 libpam-ssh,
43 monkeysphere,
44 ssh-askpass,
45Provides: rsh-client,
46 ssh-client,
47Multi-Arch: foreign
48Description: secure shell (SSH) client, for secure access to remote machines
49 This is the portable version of OpenSSH, a free implementation of
50 the Secure Shell protocol as specified by the IETF secsh working
51 group.
52 .
53 Ssh (Secure Shell) is a program for logging into a remote machine
54 and for executing commands on a remote machine.
55 It provides secure encrypted communications between two untrusted
56 hosts over an insecure network. X11 connections and arbitrary TCP/IP
57 ports can also be forwarded over the secure channel.
58 It can be used to provide applications with a secure communication
59 channel.
60 .
61 This package provides the ssh, scp and sftp clients, the ssh-agent
62 and ssh-add programs to make public key authentication more convenient,
63 and the ssh-keygen, ssh-keyscan, ssh-copy-id and ssh-argv0 utilities.
64 .
65 In some countries it may be illegal to use any encryption at all
66 without a special permit.
67 .
68 ssh replaces the insecure rsh, rcp and rlogin programs, which are
69 obsolete for most purposes.
70
71Package: openssh-server
72Priority: optional
73Architecture: any
74Pre-Depends: ${misc:Pre-Depends},
75Depends: adduser (>= 3.9),
76 dpkg (>= 1.9.0),
77 libpam-modules (>= 0.72-9),
78 libpam-runtime (>= 0.76-14),
79 lsb-base (>= 4.1+Debian3),
80 openssh-client (= ${binary:Version}),
81 openssh-sftp-server,
82 procps,
83 ucf (>= 0.28),
84 ${misc:Depends},
85 ${shlibs:Depends},
86Recommends: default-logind | logind | libpam-systemd,
87 ncurses-term,
88 xauth,
89 ${openssh-server:Recommends},
90Conflicts: sftp,
91 ssh-socks,
92 ssh2,
93Replaces: openssh-client (<< 1:7.9p1-8),
94 ssh,
95 ssh-krb5,
96Breaks: ${runit:Breaks},
97Suggests: molly-guard,
98 monkeysphere,
99 ssh-askpass,
100 ufw,
101Provides: ssh-server,
102Multi-Arch: foreign
103Description: secure shell (SSH) server, for secure access from remote machines
104 This is the portable version of OpenSSH, a free implementation of
105 the Secure Shell protocol as specified by the IETF secsh working
106 group.
107 .
108 Ssh (Secure Shell) is a program for logging into a remote machine
109 and for executing commands on a remote machine.
110 It provides secure encrypted communications between two untrusted
111 hosts over an insecure network. X11 connections and arbitrary TCP/IP
112 ports can also be forwarded over the secure channel.
113 It can be used to provide applications with a secure communication
114 channel.
115 .
116 This package provides the sshd server.
117 .
118 In some countries it may be illegal to use any encryption at all
119 without a special permit.
120 .
121 sshd replaces the insecure rshd program, which is obsolete for most
122 purposes.
123
124Package: openssh-sftp-server
125Priority: optional
126Architecture: any
127Depends: ${misc:Depends},
128 ${shlibs:Depends},
129Recommends: openssh-server | ssh-server,
130Breaks: openssh-server (<< 1:6.5p1-5),
131Replaces: openssh-server (<< 1:6.5p1-5),
132Enhances: openssh-server,
133 ssh-server,
134Multi-Arch: foreign
135Description: secure shell (SSH) sftp server module, for SFTP access from remote machines
136 This is the portable version of OpenSSH, a free implementation of
137 the Secure Shell protocol as specified by the IETF secsh working
138 group.
139 .
140 Ssh (Secure Shell) is a program for logging into a remote machine
141 and for executing commands on a remote machine.
142 It provides secure encrypted communications between two untrusted
143 hosts over an insecure network. X11 connections and arbitrary TCP/IP
144 ports can also be forwarded over the secure channel.
145 It can be used to provide applications with a secure communication
146 channel.
147 .
148 This package provides the SFTP server module for the SSH server. It
149 is needed if you want to access your SSH server with SFTP. The SFTP
150 server module also works with other SSH daemons like dropbear.
151 .
152 OpenSSH's sftp and sftp-server implement revision 3 of the SSH filexfer
153 protocol described in:
154 .
155 http://www.openssh.com/txt/draft-ietf-secsh-filexfer-02.txt
156 .
157 Newer versions of the draft will not be supported, though some features
158 are individually implemented as extensions.
159
160Package: openssh-tests
161Priority: optional
162Architecture: any
163Depends: openssh-client (= ${binary:Version}),
164 openssh-server (= ${binary:Version}),
165 openssh-sftp-server (= ${binary:Version}),
166 openssl,
167 putty-tools (>= 0.67-2),
168 python3-twisted,
169 ${misc:Depends},
170 ${shlibs:Depends},
171Multi-Arch: foreign
172Description: OpenSSH regression tests
173 This package provides OpenSSH's regression test suite. It is mainly
174 intended for use with the autopkgtest system, though can also be run
175 directly using /usr/lib/openssh/regress/run-tests.
176
177Package: ssh
178Priority: optional
179Architecture: all
180Pre-Depends: dpkg (>= 1.17.5),
181Depends: openssh-client (>= ${binary:Version}),
182 openssh-server (>= ${binary:Version}),
183 ${misc:Depends},
184Multi-Arch: foreign
185Description: secure shell client and server (metapackage)
186 This metapackage is a convenient way to install both the OpenSSH client
187 and the OpenSSH server. It provides nothing in and of itself, so you
188 may remove it if nothing depends on it.
189
190Package: ssh-askpass-gnome
191Build-Profiles: <!pkg.openssh.nognome>
192Section: gnome
193Priority: optional
194Architecture: any
195Depends: openssh-client | ssh (>= 1:1.2pre7-4),
196 ${misc:Depends},
197 ${shlibs:Depends},
198Replaces: ssh (<< 1:3.5p1-3),
199Provides: ssh-askpass,
200Multi-Arch: foreign
201Description: interactive X program to prompt users for a passphrase for ssh-add
202 This has been split out of the main openssh-client package so that
203 openssh-client does not need to depend on GTK+.
204 .
205 You probably want the ssh-askpass package instead, but this is
206 provided to add to your choice and/or confusion.
207
208Package: openssh-client-udeb
209Build-Profiles: <!noudeb>
210Package-Type: udeb
211Section: debian-installer
212Priority: optional
213Architecture: any
214Depends: ${shlibs:Depends},
215XB-Installer-Menu-Item: 99999
216Description: secure shell client for the Debian installer
217 This is the portable version of OpenSSH, a free implementation of
218 the Secure Shell protocol as specified by the IETF secsh working
219 group.
220 .
221 This package provides the ssh client for use in debian-installer.
222
223Package: openssh-server-udeb
224Build-Profiles: <!noudeb>
225Package-Type: udeb
226Section: debian-installer
227Priority: optional
228Architecture: any
229Depends: ${shlibs:Depends},
230Description: secure shell server for the Debian installer
231 This is the portable version of OpenSSH, a free implementation of
232 the Secure Shell protocol as specified by the IETF secsh working
233 group.
234 .
235 This package provides the sshd server for use in debian-installer.
236 Since it is expected to be used in specialized situations (e.g. S/390
237 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..e10ca2f0c
--- /dev/null
+++ b/debian/openssh-client.apport
@@ -0,0 +1,35 @@
1'''apport hook for openssh-client
2
3(c) 2010 Canonical Ltd.
4Author: Chuck Short <chuck.short@canonical.com>
5
6This program is free software; you can redistribute it and/or modify it
7under the terms of the GNU General Public License as published by the
8Free Software Foundation; either version 2 of the License, or (at your
9option) any later version. See http://www.gnu.org/copyleft/gpl.html for
10the full text of the license.
11'''
12
13from apport.hookutils import (
14 attach_conffiles,
15 attach_related_packages,
16 command_output,
17)
18
19
20def add_info(report, ui):
21 response = ui.yesno("The contents of your /etc/ssh/ssh_config file "
22 "may help developers diagnose your bug more "
23 "quickly. However, it may contain sensitive "
24 "information. Do you want to include it in your "
25 "bug report?")
26
27 if response == None: # user cancelled
28 raise StopIteration
29
30 elif response:
31 attach_conffiles(report, 'openssh-client')
32
33 attach_related_packages(report,
34 ['ssh-askpass', 'libpam-ssh', 'keychain', 'ssh-askpass-gnome'])
35 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..11aa99402
--- /dev/null
+++ b/debian/openssh-client.docs
@@ -0,0 +1,5 @@
1OVERVIEW
2README
3README.dns
4README.tun
5debian/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..aa853b51c
--- /dev/null
+++ b/debian/openssh-server.apport
@@ -0,0 +1,27 @@
1'''apport hook for openssh-server
2
3(c) 2010 Canonical Ltd.
4Author: Chuck Short <chuck.short@canonical.com>
5
6This program is free software; you can redistribute it and/or modify it
7under the terms of the GNU General Public License as published by the
8Free Software Foundation; either version 2 of the License, or (at your
9option) any later version. See http://www.gnu.org/copyleft/gpl.html for
10the full text of the license.
11'''
12
13from apport.hookutils import root_command_output
14
15
16def add_info(report, ui):
17 response = ui.yesno("The contents of your /etc/ssh/sshd_config file "
18 "may help developers diagnose your bug more "
19 "quickly. However, it may contain sensitive "
20 "information. Do you want to include it in your "
21 "bug report?")
22
23 if response == None: # user cancelled
24 raise StopIteration
25
26 elif response:
27 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.runit b/debian/openssh-server.runit
new file mode 100644
index 000000000..cb659a00b
--- /dev/null
+++ b/debian/openssh-server.runit
@@ -0,0 +1 @@
debian/openssh-server.ssh.runscript logscript,name=ssh,since=1:8.0p1-5
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.runscript/finish b/debian/openssh-server.ssh.runscript/finish
new file mode 100644
index 000000000..7e29ef1db
--- /dev/null
+++ b/debian/openssh-server.ssh.runscript/finish
@@ -0,0 +1,16 @@
1#!/bin/sh
2set -e
3
4NAME=ssh
5
6[ $1 = -1 ] && echo "runsv: ERROR in $NAME: unexpected error or wrong sh syntax"
7# no need to stop the service here, runsv will stop trying after the first attempt
8
9[ $1 = 161 ] && echo "runsv: ERROR $1 in $NAME: disabled by local settings" \
10 && sv d $(dirname $0) && exit 0
11
12[ $1 = 162 ] && echo "runsv: ERROR $1 in $NAME: configtest or early setup failed" \
13 && sv d $(dirname $0) && exit 0
14
15echo "$NAME Stopped"
16
diff --git a/debian/openssh-server.ssh.runscript/run b/debian/openssh-server.ssh.runscript/run
new file mode 100644
index 000000000..1d0524502
--- /dev/null
+++ b/debian/openssh-server.ssh.runscript/run
@@ -0,0 +1,20 @@
1#!/usr/bin/env /lib/runit/invoke-run
2set -e
3
4NAME="ssh"
5
6sv start auditd || sv check auditd || true
7
8# don't start if 'sshd_not_to_be_run' exists
9test -e /etc/ssh/sshd_not_to_be_run && exit 161
10
11#Create /run/sshd
12test -d /run/sshd || mkdir /run/sshd && chmod 0755 /run/sshd
13
14exec 2>&1
15
16#Config test
17/usr/sbin/sshd -t || exit 162
18
19echo "Starting $NAME..."
20exec /usr/sbin/sshd -D -e $SSHD_OPTS
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..01f1bf35c
--- /dev/null
+++ b/debian/patches/authorized-keys-man-symlink.patch
@@ -0,0 +1,26 @@
1From 7febe5a4b6bcb94d887ac1fe22e8a1742ffb609f 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 ab29e4f05..9b8a42c1e 100644
17--- a/Makefile.in
18+++ b/Makefile.in
19@@ -362,6 +362,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/conch-old-privkey-format.patch b/debian/patches/conch-old-privkey-format.patch
new file mode 100644
index 000000000..e018ac639
--- /dev/null
+++ b/debian/patches/conch-old-privkey-format.patch
@@ -0,0 +1,68 @@
1From bbce4380e516e8bfed1ae09af0bc3661e427794a 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: 2019-10-09
12
13Patch-Name: conch-old-privkey-format.patch
14---
15 regress/Makefile | 2 +-
16 regress/conch-ciphers.sh | 2 +-
17 regress/test-exec.sh | 12 ++++++++++++
18 3 files changed, 14 insertions(+), 2 deletions(-)
19
20diff --git a/regress/Makefile b/regress/Makefile
21index 34c47e8cb..17e0a06e8 100644
22--- a/regress/Makefile
23+++ b/regress/Makefile
24@@ -119,7 +119,7 @@ CLEANFILES= *.core actual agent-key.* authorized_keys_${USERNAME} \
25 rsa_ssh2_crnl.prv scp-ssh-wrapper.exe \
26 scp-ssh-wrapper.scp setuid-allowed sftp-server.log \
27 sftp-server.sh sftp.log ssh-log-wrapper.sh ssh.log \
28- ssh-rsa_oldfmt \
29+ ssh-rsa_oldfmt ssh-rsa_oldfmt.pub \
30 ssh_config ssh_config.* ssh_proxy ssh_proxy_bak \
31 ssh_proxy_envpass sshd.log sshd_config sshd_config_minimal \
32 sshd_config.orig sshd_proxy sshd_proxy.* sshd_proxy_bak \
33diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
34index 6678813a2..6ff5da20b 100644
35--- a/regress/conch-ciphers.sh
36+++ b/regress/conch-ciphers.sh
37@@ -16,7 +16,7 @@ for c in aes256-ctr aes256-cbc aes192-ctr aes192-cbc aes128-ctr aes128-cbc \
38 rm -f ${COPY}
39 # XXX the 2nd "cat" seems to be needed because of buggy FD handling
40 # in conch
41- ${CONCH} --identity $OBJ/ssh-rsa --port $PORT --user $USER -e none \
42+ ${CONCH} --identity $OBJ/ssh-rsa_oldfmt --port $PORT --user $USER -e none \
43 --known-hosts $OBJ/known_hosts --notty --noagent --nox11 -n \
44 127.0.0.1 "cat ${DATA}" 2>/dev/null | cat > ${COPY}
45 if [ $? -ne 0 ]; then
46diff --git a/regress/test-exec.sh b/regress/test-exec.sh
47index 508b93284..5e48bfbe3 100644
48--- a/regress/test-exec.sh
49+++ b/regress/test-exec.sh
50@@ -510,6 +510,18 @@ REGRESS_INTEROP_CONCH=no
51 if test -x "$CONCH" ; then
52 REGRESS_INTEROP_CONCH=yes
53 fi
54+case "$SCRIPT" in
55+*conch*) ;;
56+*) REGRESS_INTEROP_CONCH=no
57+esac
58+
59+if test "$REGRESS_INTEROP_CONCH" = "yes" ; then
60+ # Convert rsa key to old format to work around
61+ # https://twistedmatrix.com/trac/ticket/9515
62+ cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt
63+ cp $OBJ/ssh-rsa.pub $OBJ/ssh-rsa_oldfmt.pub
64+ ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null
65+fi
66
67 # If PuTTY is present and we are running a PuTTY test, prepare keys and
68 # configuration
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch
new file mode 100644
index 000000000..acf995e27
--- /dev/null
+++ b/debian/patches/debian-banner.patch
@@ -0,0 +1,163 @@
1From 4eb06adf69f21f387e4f2d29dad01b2ca1303094 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: 2019-06-05
12
13Patch-Name: debian-banner.patch
14---
15 kex.c | 5 +++--
16 kex.h | 2 +-
17 servconf.c | 9 +++++++++
18 servconf.h | 2 ++
19 sshconnect.c | 2 +-
20 sshd.c | 3 ++-
21 sshd_config.5 | 5 +++++
22 7 files changed, 23 insertions(+), 5 deletions(-)
23
24diff --git a/kex.c b/kex.c
25index 65ed6af02..f450bc2c7 100644
26--- a/kex.c
27+++ b/kex.c
28@@ -1221,7 +1221,7 @@ send_error(struct ssh *ssh, char *msg)
29 */
30 int
31 kex_exchange_identification(struct ssh *ssh, int timeout_ms,
32- const char *version_addendum)
33+ int debian_banner, const char *version_addendum)
34 {
35 int remote_major, remote_minor, mismatch;
36 size_t len, i, n;
37@@ -1239,7 +1239,8 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
38 if (version_addendum != NULL && *version_addendum == '\0')
39 version_addendum = NULL;
40 if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
41- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
42+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2,
43+ debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM,
44 version_addendum == NULL ? "" : " ",
45 version_addendum == NULL ? "" : version_addendum)) != 0) {
46 error("%s: sshbuf_putf: %s", __func__, ssh_err(r));
47diff --git a/kex.h b/kex.h
48index fe7141414..938dca03b 100644
49--- a/kex.h
50+++ b/kex.h
51@@ -194,7 +194,7 @@ char *kex_names_cat(const char *, const char *);
52 int kex_assemble_names(char **, const char *, const char *);
53 int kex_gss_names_valid(const char *);
54
55-int kex_exchange_identification(struct ssh *, int, const char *);
56+int kex_exchange_identification(struct ssh *, int, int, const char *);
57
58 struct kex *kex_new(void);
59 int kex_ready(struct ssh *, char *[PROPOSAL_MAX]);
60diff --git a/servconf.c b/servconf.c
61index 73b93c636..5576098a5 100644
62--- a/servconf.c
63+++ b/servconf.c
64@@ -184,6 +184,7 @@ initialize_server_options(ServerOptions *options)
65 options->fingerprint_hash = -1;
66 options->disable_forwarding = -1;
67 options->expose_userauth_info = -1;
68+ options->debian_banner = -1;
69 }
70
71 /* Returns 1 if a string option is unset or set to "none" or 0 otherwise. */
72@@ -437,6 +438,8 @@ fill_default_server_options(ServerOptions *options)
73 options->disable_forwarding = 0;
74 if (options->expose_userauth_info == -1)
75 options->expose_userauth_info = 0;
76+ if (options->debian_banner == -1)
77+ options->debian_banner = 1;
78
79 assemble_algorithms(options);
80
81@@ -523,6 +526,7 @@ typedef enum {
82 sStreamLocalBindMask, sStreamLocalBindUnlink,
83 sAllowStreamLocalForwarding, sFingerprintHash, sDisableForwarding,
84 sExposeAuthInfo, sRDomain,
85+ sDebianBanner,
86 sDeprecated, sIgnore, sUnsupported
87 } ServerOpCodes;
88
89@@ -682,6 +686,7 @@ static struct {
90 { "exposeauthinfo", sExposeAuthInfo, SSHCFG_ALL },
91 { "rdomain", sRDomain, SSHCFG_ALL },
92 { "casignaturealgorithms", sCASignatureAlgorithms, SSHCFG_ALL },
93+ { "debianbanner", sDebianBanner, SSHCFG_GLOBAL },
94 { NULL, sBadOption, 0 }
95 };
96
97@@ -2217,6 +2222,10 @@ process_server_config_line(ServerOptions *options, char *line,
98 *charptr = xstrdup(arg);
99 break;
100
101+ case sDebianBanner:
102+ intptr = &options->debian_banner;
103+ goto parse_flag;
104+
105 case sDeprecated:
106 case sIgnore:
107 case sUnsupported:
108diff --git a/servconf.h b/servconf.h
109index 29329ba1f..d5ad19065 100644
110--- a/servconf.h
111+++ b/servconf.h
112@@ -214,6 +214,8 @@ typedef struct {
113 int fingerprint_hash;
114 int expose_userauth_info;
115 u_int64_t timing_secret;
116+
117+ int debian_banner;
118 } ServerOptions;
119
120 /* Information about the incoming connection as used by Match */
121diff --git a/sshconnect.c b/sshconnect.c
122index 41e75a275..27daef74f 100644
123--- a/sshconnect.c
124+++ b/sshconnect.c
125@@ -1291,7 +1291,7 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const char *orighost,
126 lowercase(host);
127
128 /* Exchange protocol version identification strings with the server. */
129- if (kex_exchange_identification(ssh, timeout_ms, NULL) != 0)
130+ if (kex_exchange_identification(ssh, timeout_ms, 1, NULL) != 0)
131 cleanup_exit(255); /* error already logged */
132
133 /* Put the connection into non-blocking mode. */
134diff --git a/sshd.c b/sshd.c
135index ea8beacb4..4e8ff0662 100644
136--- a/sshd.c
137+++ b/sshd.c
138@@ -2165,7 +2165,8 @@ main(int ac, char **av)
139 if (!debug_flag)
140 alarm(options.login_grace_time);
141
142- if (kex_exchange_identification(ssh, -1, options.version_addendum) != 0)
143+ if (kex_exchange_identification(ssh, -1, options.debian_banner,
144+ options.version_addendum) != 0)
145 cleanup_exit(255); /* error already logged */
146
147 ssh_packet_set_nonblocking(ssh);
148diff --git a/sshd_config.5 b/sshd_config.5
149index eec224158..46537f177 100644
150--- a/sshd_config.5
151+++ b/sshd_config.5
152@@ -545,6 +545,11 @@ or
153 .Cm no .
154 The default is
155 .Cm yes .
156+.It Cm DebianBanner
157+Specifies whether the distribution-specified extra version suffix is
158+included during initial protocol handshake.
159+The default is
160+.Cm yes .
161 .It Cm DenyGroups
162 This keyword can be followed by a list of group name patterns, separated
163 by spaces.
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
new file mode 100644
index 000000000..fe1e3f550
--- /dev/null
+++ b/debian/patches/debian-config.patch
@@ -0,0 +1,238 @@
1From 7abde40896668ce9debfe056c7dabc6a70ef7da4 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 16d2729dd..253574ce0 100644
43--- a/readconf.c
44+++ b/readconf.c
45@@ -2037,7 +2037,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 24530e511..fd495da2c 100644
56--- a/ssh.1
57+++ b/ssh.1
58@@ -795,6 +795,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@@ -803,6 +813,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 1ff999b68..6dd6ecf87 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@@ -45,3 +46,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 4b42aab9d..d27655e15 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@@ -721,11 +737,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 270805060..02e29cb6f 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..6e8f0ae2f
--- /dev/null
+++ b/debian/patches/dnssec-sshfp.patch
@@ -0,0 +1,94 @@
1From 6220be7f65137290fbe3ad71b83667e71e4ccd03 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 e4f9bf830..9c9fe6413 100644
22--- a/dns.c
23+++ b/dns.c
24@@ -210,6 +210,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@@ -233,8 +234,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..d5ddbbd26
--- /dev/null
+++ b/debian/patches/doc-hash-tab-completion.patch
@@ -0,0 +1,28 @@
1From 944653642de12f09baa546011429fb69ffc0065a 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 2c74b57c0..4b42aab9d 100644
17--- a/ssh_config.5
18+++ b/ssh_config.5
19@@ -840,6 +840,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/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch
new file mode 100644
index 000000000..89c2a9864
--- /dev/null
+++ b/debian/patches/gnome-ssh-askpass2-icon.patch
@@ -0,0 +1,26 @@
1From 4360244ab2ed367bdb2c836292e761c589355950 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..b858f4915
--- /dev/null
+++ b/debian/patches/gssapi.patch
@@ -0,0 +1,4088 @@
1From 9da806e67101afdc0d3a1d304659927acf18f5c5 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
19Origin: other, https://github.com/openssh-gsskex/openssh-gsskex/commits/debian/master
20Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242
21Last-Updated: 2019-10-09
22
23Patch-Name: gssapi.patch
24---
25 Makefile.in | 3 +-
26 auth-krb5.c | 17 +-
27 auth.c | 96 +-------
28 auth2-gss.c | 56 ++++-
29 auth2.c | 2 +
30 canohost.c | 93 ++++++++
31 canohost.h | 3 +
32 clientloop.c | 15 +-
33 configure.ac | 24 ++
34 gss-genr.c | 300 +++++++++++++++++++++++-
35 gss-serv-krb5.c | 85 ++++++-
36 gss-serv.c | 186 +++++++++++++--
37 hmac.c | 1 +
38 kex.c | 66 +++++-
39 kex.h | 29 +++
40 kexdh.c | 10 +
41 kexgen.c | 2 +-
42 kexgssc.c | 606 ++++++++++++++++++++++++++++++++++++++++++++++++
43 kexgsss.c | 474 +++++++++++++++++++++++++++++++++++++
44 mac.c | 1 +
45 monitor.c | 139 ++++++++++-
46 monitor.h | 2 +
47 monitor_wrap.c | 57 ++++-
48 monitor_wrap.h | 4 +-
49 readconf.c | 70 ++++++
50 readconf.h | 6 +
51 servconf.c | 47 ++++
52 servconf.h | 3 +
53 session.c | 10 +-
54 ssh-gss.h | 50 +++-
55 ssh.1 | 8 +
56 ssh.c | 4 +-
57 ssh_config | 2 +
58 ssh_config.5 | 57 +++++
59 sshconnect2.c | 140 ++++++++++-
60 sshd.c | 120 +++++++++-
61 sshd_config | 2 +
62 sshd_config.5 | 30 +++
63 sshkey.c | 3 +-
64 sshkey.h | 1 +
65 40 files changed, 2664 insertions(+), 160 deletions(-)
66 create mode 100644 kexgssc.c
67 create mode 100644 kexgsss.c
68
69diff --git a/Makefile.in b/Makefile.in
70index adb1977e2..ab29e4f05 100644
71--- a/Makefile.in
72+++ b/Makefile.in
73@@ -100,6 +100,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
74 kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
75 kexgexc.o kexgexs.o \
76 sntrup4591761.o kexsntrup4591761x25519.o kexgen.o \
77+ kexgssc.o \
78 platform-pledge.o platform-tracing.o platform-misc.o
79
80
81@@ -114,7 +115,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o \
82 auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
83 auth2-none.o auth2-passwd.o auth2-pubkey.o \
84 monitor.o monitor_wrap.o auth-krb5.o \
85- auth2-gss.o gss-serv.o gss-serv-krb5.o \
86+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o \
87 loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
88 sftp-server.o sftp-common.o sftp-realpath.o \
89 sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
90diff --git a/auth-krb5.c b/auth-krb5.c
91index 3096f1c8e..204752e1b 100644
92--- a/auth-krb5.c
93+++ b/auth-krb5.c
94@@ -182,8 +182,13 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
95
96 len = strlen(authctxt->krb5_ticket_file) + 6;
97 authctxt->krb5_ccname = xmalloc(len);
98+#ifdef USE_CCAPI
99+ snprintf(authctxt->krb5_ccname, len, "API:%s",
100+ authctxt->krb5_ticket_file);
101+#else
102 snprintf(authctxt->krb5_ccname, len, "FILE:%s",
103 authctxt->krb5_ticket_file);
104+#endif
105
106 #ifdef USE_PAM
107 if (options.use_pam)
108@@ -240,15 +245,22 @@ krb5_cleanup_proc(Authctxt *authctxt)
109 #ifndef HEIMDAL
110 krb5_error_code
111 ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
112- int tmpfd, ret, oerrno;
113+ int ret, oerrno;
114 char ccname[40];
115 mode_t old_umask;
116+#ifdef USE_CCAPI
117+ char cctemplate[] = "API:krb5cc_%d";
118+#else
119+ char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX";
120+ int tmpfd;
121+#endif
122
123 ret = snprintf(ccname, sizeof(ccname),
124- "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid());
125+ cctemplate, geteuid());
126 if (ret < 0 || (size_t)ret >= sizeof(ccname))
127 return ENOMEM;
128
129+#ifndef USE_CCAPI
130 old_umask = umask(0177);
131 tmpfd = mkstemp(ccname + strlen("FILE:"));
132 oerrno = errno;
133@@ -265,6 +277,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
134 return oerrno;
135 }
136 close(tmpfd);
137+#endif
138
139 return (krb5_cc_resolve(ctx, ccname, ccache));
140 }
141diff --git a/auth.c b/auth.c
142index ca450f4e4..47c27773c 100644
143--- a/auth.c
144+++ b/auth.c
145@@ -399,7 +399,8 @@ auth_root_allowed(struct ssh *ssh, const char *method)
146 case PERMIT_NO_PASSWD:
147 if (strcmp(method, "publickey") == 0 ||
148 strcmp(method, "hostbased") == 0 ||
149- strcmp(method, "gssapi-with-mic") == 0)
150+ strcmp(method, "gssapi-with-mic") == 0 ||
151+ strcmp(method, "gssapi-keyex") == 0)
152 return 1;
153 break;
154 case PERMIT_FORCED_ONLY:
155@@ -723,99 +724,6 @@ fakepw(void)
156 return (&fake);
157 }
158
159-/*
160- * Returns the remote DNS hostname as a string. The returned string must not
161- * be freed. NB. this will usually trigger a DNS query the first time it is
162- * called.
163- * This function does additional checks on the hostname to mitigate some
164- * attacks on legacy rhosts-style authentication.
165- * XXX is RhostsRSAAuthentication vulnerable to these?
166- * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
167- */
168-
169-static char *
170-remote_hostname(struct ssh *ssh)
171-{
172- struct sockaddr_storage from;
173- socklen_t fromlen;
174- struct addrinfo hints, *ai, *aitop;
175- char name[NI_MAXHOST], ntop2[NI_MAXHOST];
176- const char *ntop = ssh_remote_ipaddr(ssh);
177-
178- /* Get IP address of client. */
179- fromlen = sizeof(from);
180- memset(&from, 0, sizeof(from));
181- if (getpeername(ssh_packet_get_connection_in(ssh),
182- (struct sockaddr *)&from, &fromlen) == -1) {
183- debug("getpeername failed: %.100s", strerror(errno));
184- return strdup(ntop);
185- }
186-
187- ipv64_normalise_mapped(&from, &fromlen);
188- if (from.ss_family == AF_INET6)
189- fromlen = sizeof(struct sockaddr_in6);
190-
191- debug3("Trying to reverse map address %.100s.", ntop);
192- /* Map the IP address to a host name. */
193- if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
194- NULL, 0, NI_NAMEREQD) != 0) {
195- /* Host name not found. Use ip address. */
196- return strdup(ntop);
197- }
198-
199- /*
200- * if reverse lookup result looks like a numeric hostname,
201- * someone is trying to trick us by PTR record like following:
202- * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5
203- */
204- memset(&hints, 0, sizeof(hints));
205- hints.ai_socktype = SOCK_DGRAM; /*dummy*/
206- hints.ai_flags = AI_NUMERICHOST;
207- if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
208- logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
209- name, ntop);
210- freeaddrinfo(ai);
211- return strdup(ntop);
212- }
213-
214- /* Names are stored in lowercase. */
215- lowercase(name);
216-
217- /*
218- * Map it back to an IP address and check that the given
219- * address actually is an address of this host. This is
220- * necessary because anyone with access to a name server can
221- * define arbitrary names for an IP address. Mapping from
222- * name to IP address can be trusted better (but can still be
223- * fooled if the intruder has access to the name server of
224- * the domain).
225- */
226- memset(&hints, 0, sizeof(hints));
227- hints.ai_family = from.ss_family;
228- hints.ai_socktype = SOCK_STREAM;
229- if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
230- logit("reverse mapping checking getaddrinfo for %.700s "
231- "[%s] failed.", name, ntop);
232- return strdup(ntop);
233- }
234- /* Look for the address from the list of addresses. */
235- for (ai = aitop; ai; ai = ai->ai_next) {
236- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
237- sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
238- (strcmp(ntop, ntop2) == 0))
239- break;
240- }
241- freeaddrinfo(aitop);
242- /* If we reached the end of the list, the address was not there. */
243- if (ai == NULL) {
244- /* Address not found for the host name. */
245- logit("Address %.100s maps to %.600s, but this does not "
246- "map back to the address.", ntop, name);
247- return strdup(ntop);
248- }
249- return strdup(name);
250-}
251-
252 /*
253 * Return the canonical name of the host in the other side of the current
254 * connection. The host name is cached, so it is efficient to call this
255diff --git a/auth2-gss.c b/auth2-gss.c
256index 9351e0428..d6446c0cf 100644
257--- a/auth2-gss.c
258+++ b/auth2-gss.c
259@@ -1,7 +1,7 @@
260 /* $OpenBSD: auth2-gss.c,v 1.29 2018/07/31 03:10:27 djm Exp $ */
261
262 /*
263- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
264+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
265 *
266 * Redistribution and use in source and binary forms, with or without
267 * modification, are permitted provided that the following conditions
268@@ -54,6 +54,48 @@ static int input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh);
269 static int input_gssapi_exchange_complete(int type, u_int32_t plen, struct ssh *ssh);
270 static int input_gssapi_errtok(int, u_int32_t, struct ssh *);
271
272+/*
273+ * The 'gssapi_keyex' userauth mechanism.
274+ */
275+static int
276+userauth_gsskeyex(struct ssh *ssh)
277+{
278+ Authctxt *authctxt = ssh->authctxt;
279+ int r, authenticated = 0;
280+ struct sshbuf *b = NULL;
281+ gss_buffer_desc mic, gssbuf;
282+ u_char *p;
283+ size_t len;
284+
285+ if ((r = sshpkt_get_string(ssh, &p, &len)) != 0 ||
286+ (r = sshpkt_get_end(ssh)) != 0)
287+ fatal("%s: %s", __func__, ssh_err(r));
288+
289+ if ((b = sshbuf_new()) == NULL)
290+ fatal("%s: sshbuf_new failed", __func__);
291+
292+ mic.value = p;
293+ mic.length = len;
294+
295+ ssh_gssapi_buildmic(b, authctxt->user, authctxt->service,
296+ "gssapi-keyex");
297+
298+ if ((gssbuf.value = sshbuf_mutable_ptr(b)) == NULL)
299+ fatal("%s: sshbuf_mutable_ptr failed", __func__);
300+ gssbuf.length = sshbuf_len(b);
301+
302+ /* gss_kex_context is NULL with privsep, so we can't check it here */
303+ if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context,
304+ &gssbuf, &mic))))
305+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
306+ authctxt->pw, 1));
307+
308+ sshbuf_free(b);
309+ free(mic.value);
310+
311+ return (authenticated);
312+}
313+
314 /*
315 * We only support those mechanisms that we know about (ie ones that we know
316 * how to check local user kuserok and the like)
317@@ -260,7 +302,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, struct ssh *ssh)
318 if ((r = sshpkt_get_end(ssh)) != 0)
319 fatal("%s: %s", __func__, ssh_err(r));
320
321- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
322+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
323+ authctxt->pw, 1));
324
325 if ((!use_privsep || mm_is_monitor()) &&
326 (displayname = ssh_gssapi_displayname()) != NULL)
327@@ -306,7 +349,8 @@ input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh)
328 gssbuf.length = sshbuf_len(b);
329
330 if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic))))
331- authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
332+ authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user,
333+ authctxt->pw, 0));
334 else
335 logit("GSSAPI MIC check failed");
336
337@@ -326,6 +370,12 @@ input_gssapi_mic(int type, u_int32_t plen, struct ssh *ssh)
338 return 0;
339 }
340
341+Authmethod method_gsskeyex = {
342+ "gssapi-keyex",
343+ userauth_gsskeyex,
344+ &options.gss_authentication
345+};
346+
347 Authmethod method_gssapi = {
348 "gssapi-with-mic",
349 userauth_gssapi,
350diff --git a/auth2.c b/auth2.c
351index 0e7762242..1c217268c 100644
352--- a/auth2.c
353+++ b/auth2.c
354@@ -73,6 +73,7 @@ extern Authmethod method_passwd;
355 extern Authmethod method_kbdint;
356 extern Authmethod method_hostbased;
357 #ifdef GSSAPI
358+extern Authmethod method_gsskeyex;
359 extern Authmethod method_gssapi;
360 #endif
361
362@@ -80,6 +81,7 @@ Authmethod *authmethods[] = {
363 &method_none,
364 &method_pubkey,
365 #ifdef GSSAPI
366+ &method_gsskeyex,
367 &method_gssapi,
368 #endif
369 &method_passwd,
370diff --git a/canohost.c b/canohost.c
371index abea9c6e6..9a00fc2cf 100644
372--- a/canohost.c
373+++ b/canohost.c
374@@ -35,6 +35,99 @@
375 #include "canohost.h"
376 #include "misc.h"
377
378+/*
379+ * Returns the remote DNS hostname as a string. The returned string must not
380+ * be freed. NB. this will usually trigger a DNS query the first time it is
381+ * called.
382+ * This function does additional checks on the hostname to mitigate some
383+ * attacks on legacy rhosts-style authentication.
384+ * XXX is RhostsRSAAuthentication vulnerable to these?
385+ * XXX Can we remove these checks? (or if not, remove RhostsRSAAuthentication?)
386+ */
387+
388+char *
389+remote_hostname(struct ssh *ssh)
390+{
391+ struct sockaddr_storage from;
392+ socklen_t fromlen;
393+ struct addrinfo hints, *ai, *aitop;
394+ char name[NI_MAXHOST], ntop2[NI_MAXHOST];
395+ const char *ntop = ssh_remote_ipaddr(ssh);
396+
397+ /* Get IP address of client. */
398+ fromlen = sizeof(from);
399+ memset(&from, 0, sizeof(from));
400+ if (getpeername(ssh_packet_get_connection_in(ssh),
401+ (struct sockaddr *)&from, &fromlen) == -1) {
402+ debug("getpeername failed: %.100s", strerror(errno));
403+ return strdup(ntop);
404+ }
405+
406+ ipv64_normalise_mapped(&from, &fromlen);
407+ if (from.ss_family == AF_INET6)
408+ fromlen = sizeof(struct sockaddr_in6);
409+
410+ debug3("Trying to reverse map address %.100s.", ntop);
411+ /* Map the IP address to a host name. */
412+ if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
413+ NULL, 0, NI_NAMEREQD) != 0) {
414+ /* Host name not found. Use ip address. */
415+ return strdup(ntop);
416+ }
417+
418+ /*
419+ * if reverse lookup result looks like a numeric hostname,
420+ * someone is trying to trick us by PTR record like following:
421+ * 1.1.1.10.in-addr.arpa. IN PTR 2.3.4.5
422+ */
423+ memset(&hints, 0, sizeof(hints));
424+ hints.ai_socktype = SOCK_DGRAM; /*dummy*/
425+ hints.ai_flags = AI_NUMERICHOST;
426+ if (getaddrinfo(name, NULL, &hints, &ai) == 0) {
427+ logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
428+ name, ntop);
429+ freeaddrinfo(ai);
430+ return strdup(ntop);
431+ }
432+
433+ /* Names are stored in lowercase. */
434+ lowercase(name);
435+
436+ /*
437+ * Map it back to an IP address and check that the given
438+ * address actually is an address of this host. This is
439+ * necessary because anyone with access to a name server can
440+ * define arbitrary names for an IP address. Mapping from
441+ * name to IP address can be trusted better (but can still be
442+ * fooled if the intruder has access to the name server of
443+ * the domain).
444+ */
445+ memset(&hints, 0, sizeof(hints));
446+ hints.ai_family = from.ss_family;
447+ hints.ai_socktype = SOCK_STREAM;
448+ if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
449+ logit("reverse mapping checking getaddrinfo for %.700s "
450+ "[%s] failed.", name, ntop);
451+ return strdup(ntop);
452+ }
453+ /* Look for the address from the list of addresses. */
454+ for (ai = aitop; ai; ai = ai->ai_next) {
455+ if (getnameinfo(ai->ai_addr, ai->ai_addrlen, ntop2,
456+ sizeof(ntop2), NULL, 0, NI_NUMERICHOST) == 0 &&
457+ (strcmp(ntop, ntop2) == 0))
458+ break;
459+ }
460+ freeaddrinfo(aitop);
461+ /* If we reached the end of the list, the address was not there. */
462+ if (ai == NULL) {
463+ /* Address not found for the host name. */
464+ logit("Address %.100s maps to %.600s, but this does not "
465+ "map back to the address.", ntop, name);
466+ return strdup(ntop);
467+ }
468+ return strdup(name);
469+}
470+
471 void
472 ipv64_normalise_mapped(struct sockaddr_storage *addr, socklen_t *len)
473 {
474diff --git a/canohost.h b/canohost.h
475index 26d62855a..0cadc9f18 100644
476--- a/canohost.h
477+++ b/canohost.h
478@@ -15,6 +15,9 @@
479 #ifndef _CANOHOST_H
480 #define _CANOHOST_H
481
482+struct ssh;
483+
484+char *remote_hostname(struct ssh *);
485 char *get_peer_ipaddr(int);
486 int get_peer_port(int);
487 char *get_local_ipaddr(int);
488diff --git a/clientloop.c b/clientloop.c
489index b5a1f7038..9def2a1a9 100644
490--- a/clientloop.c
491+++ b/clientloop.c
492@@ -112,6 +112,10 @@
493 #include "ssherr.h"
494 #include "hostfile.h"
495
496+#ifdef GSSAPI
497+#include "ssh-gss.h"
498+#endif
499+
500 /* import options */
501 extern Options options;
502
503@@ -1373,9 +1377,18 @@ client_loop(struct ssh *ssh, int have_pty, int escape_char_arg,
504 break;
505
506 /* Do channel operations unless rekeying in progress. */
507- if (!ssh_packet_is_rekeying(ssh))
508+ if (!ssh_packet_is_rekeying(ssh)) {
509 channel_after_select(ssh, readset, writeset);
510
511+#ifdef GSSAPI
512+ if (options.gss_renewal_rekey &&
513+ ssh_gssapi_credentials_updated(NULL)) {
514+ debug("credentials updated - forcing rekey");
515+ need_rekeying = 1;
516+ }
517+#endif
518+ }
519+
520 /* Buffer input from the connection. */
521 client_process_net_input(ssh, readset);
522
523diff --git a/configure.ac b/configure.ac
524index 3e93c0276..1c2512314 100644
525--- a/configure.ac
526+++ b/configure.ac
527@@ -666,6 +666,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
528 [Use tunnel device compatibility to OpenBSD])
529 AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
530 [Prepend the address family to IP tunnel traffic])
531+ AC_MSG_CHECKING([if we have the Security Authorization Session API])
532+ AC_TRY_COMPILE([#include <Security/AuthSession.h>],
533+ [SessionCreate(0, 0);],
534+ [ac_cv_use_security_session_api="yes"
535+ AC_DEFINE([USE_SECURITY_SESSION_API], [1],
536+ [platform has the Security Authorization Session API])
537+ LIBS="$LIBS -framework Security"
538+ AC_MSG_RESULT([yes])],
539+ [ac_cv_use_security_session_api="no"
540+ AC_MSG_RESULT([no])])
541+ AC_MSG_CHECKING([if we have an in-memory credentials cache])
542+ AC_TRY_COMPILE(
543+ [#include <Kerberos/Kerberos.h>],
544+ [cc_context_t c;
545+ (void) cc_initialize (&c, 0, NULL, NULL);],
546+ [AC_DEFINE([USE_CCAPI], [1],
547+ [platform uses an in-memory credentials cache])
548+ LIBS="$LIBS -framework Security"
549+ AC_MSG_RESULT([yes])
550+ if test "x$ac_cv_use_security_session_api" = "xno"; then
551+ AC_MSG_ERROR([*** Need a security framework to use the credentials cache API ***])
552+ fi],
553+ [AC_MSG_RESULT([no])]
554+ )
555 m4_pattern_allow([AU_IPv])
556 AC_CHECK_DECL([AU_IPv4], [],
557 AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records])
558diff --git a/gss-genr.c b/gss-genr.c
559index d56257b4a..763a63ffa 100644
560--- a/gss-genr.c
561+++ b/gss-genr.c
562@@ -1,7 +1,7 @@
563 /* $OpenBSD: gss-genr.c,v 1.26 2018/07/10 09:13:30 djm Exp $ */
564
565 /*
566- * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
567+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
568 *
569 * Redistribution and use in source and binary forms, with or without
570 * modification, are permitted provided that the following conditions
571@@ -41,12 +41,36 @@
572 #include "sshbuf.h"
573 #include "log.h"
574 #include "ssh2.h"
575+#include "cipher.h"
576+#include "sshkey.h"
577+#include "kex.h"
578+#include "digest.h"
579+#include "packet.h"
580
581 #include "ssh-gss.h"
582
583 extern u_char *session_id2;
584 extern u_int session_id2_len;
585
586+typedef struct {
587+ char *encoded;
588+ gss_OID oid;
589+} ssh_gss_kex_mapping;
590+
591+/*
592+ * XXX - It would be nice to find a more elegant way of handling the
593+ * XXX passing of the key exchange context to the userauth routines
594+ */
595+
596+Gssctxt *gss_kex_context = NULL;
597+
598+static ssh_gss_kex_mapping *gss_enc2oid = NULL;
599+
600+int
601+ssh_gssapi_oid_table_ok(void) {
602+ return (gss_enc2oid != NULL);
603+}
604+
605 /* sshbuf_get for gss_buffer_desc */
606 int
607 ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
608@@ -62,6 +86,162 @@ ssh_gssapi_get_buffer_desc(struct sshbuf *b, gss_buffer_desc *g)
609 return 0;
610 }
611
612+/* sshpkt_get of gss_buffer_desc */
613+int
614+ssh_gssapi_sshpkt_get_buffer_desc(struct ssh *ssh, gss_buffer_desc *g)
615+{
616+ int r;
617+ u_char *p;
618+ size_t len;
619+
620+ if ((r = sshpkt_get_string(ssh, &p, &len)) != 0)
621+ return r;
622+ g->value = p;
623+ g->length = len;
624+ return 0;
625+}
626+
627+/*
628+ * Return a list of the gss-group1-sha1 mechanisms supported by this program
629+ *
630+ * We test mechanisms to ensure that we can use them, to avoid starting
631+ * a key exchange with a bad mechanism
632+ */
633+
634+char *
635+ssh_gssapi_client_mechanisms(const char *host, const char *client,
636+ const char *kex) {
637+ gss_OID_set gss_supported = NULL;
638+ OM_uint32 min_status;
639+
640+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported)))
641+ return NULL;
642+
643+ return ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism,
644+ host, client, kex);
645+}
646+
647+char *
648+ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check,
649+ const char *host, const char *client, const char *kex) {
650+ struct sshbuf *buf = NULL;
651+ size_t i;
652+ int r = SSH_ERR_ALLOC_FAIL;
653+ int oidpos, enclen;
654+ char *mechs, *encoded;
655+ u_char digest[SSH_DIGEST_MAX_LENGTH];
656+ char deroid[2];
657+ struct ssh_digest_ctx *md = NULL;
658+ char *s, *cp, *p;
659+
660+ if (gss_enc2oid != NULL) {
661+ for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
662+ free(gss_enc2oid[i].encoded);
663+ free(gss_enc2oid);
664+ }
665+
666+ gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) *
667+ (gss_supported->count + 1));
668+
669+ if ((buf = sshbuf_new()) == NULL)
670+ fatal("%s: sshbuf_new failed", __func__);
671+
672+ oidpos = 0;
673+ s = cp = xstrdup(kex);
674+ for (i = 0; i < gss_supported->count; i++) {
675+ if (gss_supported->elements[i].length < 128 &&
676+ (*check)(NULL, &(gss_supported->elements[i]), host, client)) {
677+
678+ deroid[0] = SSH_GSS_OIDTYPE;
679+ deroid[1] = gss_supported->elements[i].length;
680+
681+ if ((md = ssh_digest_start(SSH_DIGEST_MD5)) == NULL ||
682+ (r = ssh_digest_update(md, deroid, 2)) != 0 ||
683+ (r = ssh_digest_update(md,
684+ gss_supported->elements[i].elements,
685+ gss_supported->elements[i].length)) != 0 ||
686+ (r = ssh_digest_final(md, digest, sizeof(digest))) != 0)
687+ fatal("%s: digest failed: %s", __func__,
688+ ssh_err(r));
689+ ssh_digest_free(md);
690+ md = NULL;
691+
692+ encoded = xmalloc(ssh_digest_bytes(SSH_DIGEST_MD5)
693+ * 2);
694+ enclen = __b64_ntop(digest,
695+ ssh_digest_bytes(SSH_DIGEST_MD5), encoded,
696+ ssh_digest_bytes(SSH_DIGEST_MD5) * 2);
697+
698+ cp = strncpy(s, kex, strlen(kex));
699+ for ((p = strsep(&cp, ",")); p && *p != '\0';
700+ (p = strsep(&cp, ","))) {
701+ if (sshbuf_len(buf) != 0 &&
702+ (r = sshbuf_put_u8(buf, ',')) != 0)
703+ fatal("%s: sshbuf_put_u8 error: %s",
704+ __func__, ssh_err(r));
705+ if ((r = sshbuf_put(buf, p, strlen(p))) != 0 ||
706+ (r = sshbuf_put(buf, encoded, enclen)) != 0)
707+ fatal("%s: sshbuf_put error: %s",
708+ __func__, ssh_err(r));
709+ }
710+
711+ gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]);
712+ gss_enc2oid[oidpos].encoded = encoded;
713+ oidpos++;
714+ }
715+ }
716+ free(s);
717+ gss_enc2oid[oidpos].oid = NULL;
718+ gss_enc2oid[oidpos].encoded = NULL;
719+
720+ if ((mechs = sshbuf_dup_string(buf)) == NULL)
721+ fatal("%s: sshbuf_dup_string failed", __func__);
722+
723+ sshbuf_free(buf);
724+
725+ if (strlen(mechs) == 0) {
726+ free(mechs);
727+ mechs = NULL;
728+ }
729+
730+ return (mechs);
731+}
732+
733+gss_OID
734+ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) {
735+ int i = 0;
736+
737+#define SKIP_KEX_NAME(type) \
738+ case type: \
739+ if (strlen(name) < sizeof(type##_ID)) \
740+ return GSS_C_NO_OID; \
741+ name += sizeof(type##_ID) - 1; \
742+ break;
743+
744+ switch (kex_type) {
745+ SKIP_KEX_NAME(KEX_GSS_GRP1_SHA1)
746+ SKIP_KEX_NAME(KEX_GSS_GRP14_SHA1)
747+ SKIP_KEX_NAME(KEX_GSS_GRP14_SHA256)
748+ SKIP_KEX_NAME(KEX_GSS_GRP16_SHA512)
749+ SKIP_KEX_NAME(KEX_GSS_GEX_SHA1)
750+ SKIP_KEX_NAME(KEX_GSS_NISTP256_SHA256)
751+ SKIP_KEX_NAME(KEX_GSS_C25519_SHA256)
752+ default:
753+ return GSS_C_NO_OID;
754+ }
755+
756+#undef SKIP_KEX_NAME
757+
758+ while (gss_enc2oid[i].encoded != NULL &&
759+ strcmp(name, gss_enc2oid[i].encoded) != 0)
760+ i++;
761+
762+ if (gss_enc2oid[i].oid != NULL && ctx != NULL)
763+ ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid);
764+
765+ return gss_enc2oid[i].oid;
766+}
767+
768 /* Check that the OID in a data stream matches that in the context */
769 int
770 ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len)
771@@ -218,7 +398,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok,
772 }
773
774 ctx->major = gss_init_sec_context(&ctx->minor,
775- GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid,
776+ ctx->client_creds, &ctx->context, ctx->name, ctx->oid,
777 GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag,
778 0, NULL, recv_tok, NULL, send_tok, flags, NULL);
779
780@@ -247,9 +427,43 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
781 return (ctx->major);
782 }
783
784+OM_uint32
785+ssh_gssapi_client_identity(Gssctxt *ctx, const char *name)
786+{
787+ gss_buffer_desc gssbuf;
788+ gss_name_t gssname;
789+ OM_uint32 status;
790+ gss_OID_set oidset;
791+
792+ gssbuf.value = (void *) name;
793+ gssbuf.length = strlen(gssbuf.value);
794+
795+ gss_create_empty_oid_set(&status, &oidset);
796+ gss_add_oid_set_member(&status, ctx->oid, &oidset);
797+
798+ ctx->major = gss_import_name(&ctx->minor, &gssbuf,
799+ GSS_C_NT_USER_NAME, &gssname);
800+
801+ if (!ctx->major)
802+ ctx->major = gss_acquire_cred(&ctx->minor,
803+ gssname, 0, oidset, GSS_C_INITIATE,
804+ &ctx->client_creds, NULL, NULL);
805+
806+ gss_release_name(&status, &gssname);
807+ gss_release_oid_set(&status, &oidset);
808+
809+ if (ctx->major)
810+ ssh_gssapi_error(ctx);
811+
812+ return(ctx->major);
813+}
814+
815 OM_uint32
816 ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
817 {
818+ if (ctx == NULL)
819+ return -1;
820+
821 if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context,
822 GSS_C_QOP_DEFAULT, buffer, hash)))
823 ssh_gssapi_error(ctx);
824@@ -257,6 +471,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash)
825 return (ctx->major);
826 }
827
828+/* Priviledged when used by server */
829+OM_uint32
830+ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
831+{
832+ if (ctx == NULL)
833+ return -1;
834+
835+ ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
836+ gssbuf, gssmic, NULL);
837+
838+ return (ctx->major);
839+}
840+
841 void
842 ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
843 const char *context)
844@@ -273,11 +500,16 @@ ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,
845 }
846
847 int
848-ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
849+ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host,
850+ const char *client)
851 {
852 gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
853 OM_uint32 major, minor;
854 gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"};
855+ Gssctxt *intctx = NULL;
856+
857+ if (ctx == NULL)
858+ ctx = &intctx;
859
860 /* RFC 4462 says we MUST NOT do SPNEGO */
861 if (oid->length == spnego_oid.length &&
862@@ -287,6 +519,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
863 ssh_gssapi_build_ctx(ctx);
864 ssh_gssapi_set_oid(*ctx, oid);
865 major = ssh_gssapi_import_name(*ctx, host);
866+
867+ if (!GSS_ERROR(major) && client)
868+ major = ssh_gssapi_client_identity(*ctx, client);
869+
870 if (!GSS_ERROR(major)) {
871 major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token,
872 NULL);
873@@ -296,10 +532,66 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host)
874 GSS_C_NO_BUFFER);
875 }
876
877- if (GSS_ERROR(major))
878+ if (GSS_ERROR(major) || intctx != NULL)
879 ssh_gssapi_delete_ctx(ctx);
880
881 return (!GSS_ERROR(major));
882 }
883
884+int
885+ssh_gssapi_credentials_updated(Gssctxt *ctxt) {
886+ static gss_name_t saved_name = GSS_C_NO_NAME;
887+ static OM_uint32 saved_lifetime = 0;
888+ static gss_OID saved_mech = GSS_C_NO_OID;
889+ static gss_name_t name;
890+ static OM_uint32 last_call = 0;
891+ OM_uint32 lifetime, now, major, minor;
892+ int equal;
893+
894+ now = time(NULL);
895+
896+ if (ctxt) {
897+ debug("Rekey has happened - updating saved versions");
898+
899+ if (saved_name != GSS_C_NO_NAME)
900+ gss_release_name(&minor, &saved_name);
901+
902+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
903+ &saved_name, &saved_lifetime, NULL, NULL);
904+
905+ if (!GSS_ERROR(major)) {
906+ saved_mech = ctxt->oid;
907+ saved_lifetime+= now;
908+ } else {
909+ /* Handle the error */
910+ }
911+ return 0;
912+ }
913+
914+ if (now - last_call < 10)
915+ return 0;
916+
917+ last_call = now;
918+
919+ if (saved_mech == GSS_C_NO_OID)
920+ return 0;
921+
922+ major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL,
923+ &name, &lifetime, NULL, NULL);
924+ if (major == GSS_S_CREDENTIALS_EXPIRED)
925+ return 0;
926+ else if (GSS_ERROR(major))
927+ return 0;
928+
929+ major = gss_compare_name(&minor, saved_name, name, &equal);
930+ gss_release_name(&minor, &name);
931+ if (GSS_ERROR(major))
932+ return 0;
933+
934+ if (equal && (saved_lifetime < lifetime + now - 10))
935+ return 1;
936+
937+ return 0;
938+}
939+
940 #endif /* GSSAPI */
941diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
942index a151bc1e4..ef9beb67c 100644
943--- a/gss-serv-krb5.c
944+++ b/gss-serv-krb5.c
945@@ -1,7 +1,7 @@
946 /* $OpenBSD: gss-serv-krb5.c,v 1.9 2018/07/09 21:37:55 markus Exp $ */
947
948 /*
949- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
950+ * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
951 *
952 * Redistribution and use in source and binary forms, with or without
953 * modification, are permitted provided that the following conditions
954@@ -120,8 +120,8 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
955 krb5_error_code problem;
956 krb5_principal princ;
957 OM_uint32 maj_status, min_status;
958- int len;
959 const char *errmsg;
960+ const char *new_ccname;
961
962 if (client->creds == NULL) {
963 debug("No credentials stored");
964@@ -180,11 +180,16 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
965 return;
966 }
967
968- client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache));
969+ new_ccname = krb5_cc_get_name(krb_context, ccache);
970+
971 client->store.envvar = "KRB5CCNAME";
972- len = strlen(client->store.filename) + 6;
973- client->store.envval = xmalloc(len);
974- snprintf(client->store.envval, len, "FILE:%s", client->store.filename);
975+#ifdef USE_CCAPI
976+ xasprintf(&client->store.envval, "API:%s", new_ccname);
977+ client->store.filename = NULL;
978+#else
979+ xasprintf(&client->store.envval, "FILE:%s", new_ccname);
980+ client->store.filename = xstrdup(new_ccname);
981+#endif
982
983 #ifdef USE_PAM
984 if (options.use_pam)
985@@ -196,6 +201,71 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client)
986 return;
987 }
988
989+int
990+ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store,
991+ ssh_gssapi_client *client)
992+{
993+ krb5_ccache ccache = NULL;
994+ krb5_principal principal = NULL;
995+ char *name = NULL;
996+ krb5_error_code problem;
997+ OM_uint32 maj_status, min_status;
998+
999+ if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) {
1000+ logit("krb5_cc_resolve(): %.100s",
1001+ krb5_get_err_text(krb_context, problem));
1002+ return 0;
1003+ }
1004+
1005+ /* Find out who the principal in this cache is */
1006+ if ((problem = krb5_cc_get_principal(krb_context, ccache,
1007+ &principal))) {
1008+ logit("krb5_cc_get_principal(): %.100s",
1009+ krb5_get_err_text(krb_context, problem));
1010+ krb5_cc_close(krb_context, ccache);
1011+ return 0;
1012+ }
1013+
1014+ if ((problem = krb5_unparse_name(krb_context, principal, &name))) {
1015+ logit("krb5_unparse_name(): %.100s",
1016+ krb5_get_err_text(krb_context, problem));
1017+ krb5_free_principal(krb_context, principal);
1018+ krb5_cc_close(krb_context, ccache);
1019+ return 0;
1020+ }
1021+
1022+
1023+ if (strcmp(name,client->exportedname.value)!=0) {
1024+ debug("Name in local credentials cache differs. Not storing");
1025+ krb5_free_principal(krb_context, principal);
1026+ krb5_cc_close(krb_context, ccache);
1027+ krb5_free_unparsed_name(krb_context, name);
1028+ return 0;
1029+ }
1030+ krb5_free_unparsed_name(krb_context, name);
1031+
1032+ /* Name matches, so lets get on with it! */
1033+
1034+ if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) {
1035+ logit("krb5_cc_initialize(): %.100s",
1036+ krb5_get_err_text(krb_context, problem));
1037+ krb5_free_principal(krb_context, principal);
1038+ krb5_cc_close(krb_context, ccache);
1039+ return 0;
1040+ }
1041+
1042+ krb5_free_principal(krb_context, principal);
1043+
1044+ if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds,
1045+ ccache))) {
1046+ logit("gss_krb5_copy_ccache() failed. Sorry!");
1047+ krb5_cc_close(krb_context, ccache);
1048+ return 0;
1049+ }
1050+
1051+ return 1;
1052+}
1053+
1054 ssh_gssapi_mech gssapi_kerberos_mech = {
1055 "toWM5Slw5Ew8Mqkay+al2g==",
1056 "Kerberos",
1057@@ -203,7 +273,8 @@ ssh_gssapi_mech gssapi_kerberos_mech = {
1058 NULL,
1059 &ssh_gssapi_krb5_userok,
1060 NULL,
1061- &ssh_gssapi_krb5_storecreds
1062+ &ssh_gssapi_krb5_storecreds,
1063+ &ssh_gssapi_krb5_updatecreds
1064 };
1065
1066 #endif /* KRB5 */
1067diff --git a/gss-serv.c b/gss-serv.c
1068index ab3a15f0f..1d47870e7 100644
1069--- a/gss-serv.c
1070+++ b/gss-serv.c
1071@@ -1,7 +1,7 @@
1072 /* $OpenBSD: gss-serv.c,v 1.31 2018/07/09 21:37:55 markus Exp $ */
1073
1074 /*
1075- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
1076+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1077 *
1078 * Redistribution and use in source and binary forms, with or without
1079 * modification, are permitted provided that the following conditions
1080@@ -44,17 +44,19 @@
1081 #include "session.h"
1082 #include "misc.h"
1083 #include "servconf.h"
1084+#include "uidswap.h"
1085
1086 #include "ssh-gss.h"
1087+#include "monitor_wrap.h"
1088
1089 extern ServerOptions options;
1090
1091 static ssh_gssapi_client gssapi_client =
1092- { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER,
1093- GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL, NULL}};
1094+ { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, GSS_C_NO_CREDENTIAL,
1095+ GSS_C_NO_NAME, NULL, {NULL, NULL, NULL, NULL, NULL}, 0, 0};
1096
1097 ssh_gssapi_mech gssapi_null_mech =
1098- { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL};
1099+ { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL};
1100
1101 #ifdef KRB5
1102 extern ssh_gssapi_mech gssapi_kerberos_mech;
1103@@ -140,6 +142,29 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
1104 return (ssh_gssapi_acquire_cred(*ctx));
1105 }
1106
1107+/* Unprivileged */
1108+char *
1109+ssh_gssapi_server_mechanisms(void) {
1110+ if (supported_oids == NULL)
1111+ ssh_gssapi_prepare_supported_oids();
1112+ return (ssh_gssapi_kex_mechs(supported_oids,
1113+ &ssh_gssapi_server_check_mech, NULL, NULL,
1114+ options.gss_kex_algorithms));
1115+}
1116+
1117+/* Unprivileged */
1118+int
1119+ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data,
1120+ const char *dummy) {
1121+ Gssctxt *ctx = NULL;
1122+ int res;
1123+
1124+ res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid)));
1125+ ssh_gssapi_delete_ctx(&ctx);
1126+
1127+ return (res);
1128+}
1129+
1130 /* Unprivileged */
1131 void
1132 ssh_gssapi_supported_oids(gss_OID_set *oidset)
1133@@ -150,7 +175,9 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset)
1134 gss_OID_set supported;
1135
1136 gss_create_empty_oid_set(&min_status, oidset);
1137- gss_indicate_mechs(&min_status, &supported);
1138+
1139+ if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported)))
1140+ return;
1141
1142 while (supported_mechs[i]->name != NULL) {
1143 if (GSS_ERROR(gss_test_oid_set_member(&min_status,
1144@@ -276,8 +303,48 @@ OM_uint32
1145 ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1146 {
1147 int i = 0;
1148+ int equal = 0;
1149+ gss_name_t new_name = GSS_C_NO_NAME;
1150+ gss_buffer_desc ename = GSS_C_EMPTY_BUFFER;
1151+
1152+ if (options.gss_store_rekey && client->used && ctx->client_creds) {
1153+ if (client->mech->oid.length != ctx->oid->length ||
1154+ (memcmp(client->mech->oid.elements,
1155+ ctx->oid->elements, ctx->oid->length) !=0)) {
1156+ debug("Rekeyed credentials have different mechanism");
1157+ return GSS_S_COMPLETE;
1158+ }
1159+
1160+ if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1161+ ctx->client_creds, ctx->oid, &new_name,
1162+ NULL, NULL, NULL))) {
1163+ ssh_gssapi_error(ctx);
1164+ return (ctx->major);
1165+ }
1166+
1167+ ctx->major = gss_compare_name(&ctx->minor, client->name,
1168+ new_name, &equal);
1169+
1170+ if (GSS_ERROR(ctx->major)) {
1171+ ssh_gssapi_error(ctx);
1172+ return (ctx->major);
1173+ }
1174+
1175+ if (!equal) {
1176+ debug("Rekeyed credentials have different name");
1177+ return GSS_S_COMPLETE;
1178+ }
1179
1180- gss_buffer_desc ename;
1181+ debug("Marking rekeyed credentials for export");
1182+
1183+ gss_release_name(&ctx->minor, &client->name);
1184+ gss_release_cred(&ctx->minor, &client->creds);
1185+ client->name = new_name;
1186+ client->creds = ctx->client_creds;
1187+ ctx->client_creds = GSS_C_NO_CREDENTIAL;
1188+ client->updated = 1;
1189+ return GSS_S_COMPLETE;
1190+ }
1191
1192 client->mech = NULL;
1193
1194@@ -292,6 +359,13 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1195 if (client->mech == NULL)
1196 return GSS_S_FAILURE;
1197
1198+ if (ctx->client_creds &&
1199+ (ctx->major = gss_inquire_cred_by_mech(&ctx->minor,
1200+ ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) {
1201+ ssh_gssapi_error(ctx);
1202+ return (ctx->major);
1203+ }
1204+
1205 if ((ctx->major = gss_display_name(&ctx->minor, ctx->client,
1206 &client->displayname, NULL))) {
1207 ssh_gssapi_error(ctx);
1208@@ -309,6 +383,8 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client)
1209 return (ctx->major);
1210 }
1211
1212+ gss_release_buffer(&ctx->minor, &ename);
1213+
1214 /* We can't copy this structure, so we just move the pointer to it */
1215 client->creds = ctx->client_creds;
1216 ctx->client_creds = GSS_C_NO_CREDENTIAL;
1217@@ -356,19 +432,23 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
1218
1219 /* Privileged */
1220 int
1221-ssh_gssapi_userok(char *user)
1222+ssh_gssapi_userok(char *user, struct passwd *pw, int kex)
1223 {
1224 OM_uint32 lmin;
1225
1226+ (void) kex; /* used in privilege separation */
1227+
1228 if (gssapi_client.exportedname.length == 0 ||
1229 gssapi_client.exportedname.value == NULL) {
1230 debug("No suitable client data");
1231 return 0;
1232 }
1233 if (gssapi_client.mech && gssapi_client.mech->userok)
1234- if ((*gssapi_client.mech->userok)(&gssapi_client, user))
1235+ if ((*gssapi_client.mech->userok)(&gssapi_client, user)) {
1236+ gssapi_client.used = 1;
1237+ gssapi_client.store.owner = pw;
1238 return 1;
1239- else {
1240+ } else {
1241 /* Destroy delegated credentials if userok fails */
1242 gss_release_buffer(&lmin, &gssapi_client.displayname);
1243 gss_release_buffer(&lmin, &gssapi_client.exportedname);
1244@@ -382,14 +462,90 @@ ssh_gssapi_userok(char *user)
1245 return (0);
1246 }
1247
1248-/* Privileged */
1249-OM_uint32
1250-ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
1251+/* These bits are only used for rekeying. The unpriviledged child is running
1252+ * as the user, the monitor is root.
1253+ *
1254+ * In the child, we want to :
1255+ * *) Ask the monitor to store our credentials into the store we specify
1256+ * *) If it succeeds, maybe do a PAM update
1257+ */
1258+
1259+/* Stuff for PAM */
1260+
1261+#ifdef USE_PAM
1262+static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg,
1263+ struct pam_response **resp, void *data)
1264 {
1265- ctx->major = gss_verify_mic(&ctx->minor, ctx->context,
1266- gssbuf, gssmic, NULL);
1267+ return (PAM_CONV_ERR);
1268+}
1269+#endif
1270
1271- return (ctx->major);
1272+void
1273+ssh_gssapi_rekey_creds(void) {
1274+ int ok;
1275+#ifdef USE_PAM
1276+ int ret;
1277+ pam_handle_t *pamh = NULL;
1278+ struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
1279+ char *envstr;
1280+#endif
1281+
1282+ if (gssapi_client.store.filename == NULL &&
1283+ gssapi_client.store.envval == NULL &&
1284+ gssapi_client.store.envvar == NULL)
1285+ return;
1286+
1287+ ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store));
1288+
1289+ if (!ok)
1290+ return;
1291+
1292+ debug("Rekeyed credentials stored successfully");
1293+
1294+ /* Actually managing to play with the ssh pam stack from here will
1295+ * be next to impossible. In any case, we may want different options
1296+ * for rekeying. So, use our own :)
1297+ */
1298+#ifdef USE_PAM
1299+ if (!use_privsep) {
1300+ debug("Not even going to try and do PAM with privsep disabled");
1301+ return;
1302+ }
1303+
1304+ ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name,
1305+ &pamconv, &pamh);
1306+ if (ret)
1307+ return;
1308+
1309+ xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar,
1310+ gssapi_client.store.envval);
1311+
1312+ ret = pam_putenv(pamh, envstr);
1313+ if (!ret)
1314+ pam_setcred(pamh, PAM_REINITIALIZE_CRED);
1315+ pam_end(pamh, PAM_SUCCESS);
1316+#endif
1317+}
1318+
1319+int
1320+ssh_gssapi_update_creds(ssh_gssapi_ccache *store) {
1321+ int ok = 0;
1322+
1323+ /* Check we've got credentials to store */
1324+ if (!gssapi_client.updated)
1325+ return 0;
1326+
1327+ gssapi_client.updated = 0;
1328+
1329+ temporarily_use_uid(gssapi_client.store.owner);
1330+ if (gssapi_client.mech && gssapi_client.mech->updatecreds)
1331+ ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client);
1332+ else
1333+ debug("No update function for this mechanism");
1334+
1335+ restore_uid();
1336+
1337+ return ok;
1338 }
1339
1340 /* Privileged */
1341diff --git a/hmac.c b/hmac.c
1342index 32688876d..a79e8569c 100644
1343--- a/hmac.c
1344+++ b/hmac.c
1345@@ -21,6 +21,7 @@
1346
1347 #include <stdlib.h>
1348 #include <string.h>
1349+#include <stdlib.h>
1350
1351 #include "sshbuf.h"
1352 #include "digest.h"
1353diff --git a/kex.c b/kex.c
1354index 49d701568..e09355dbd 100644
1355--- a/kex.c
1356+++ b/kex.c
1357@@ -55,11 +55,16 @@
1358 #include "misc.h"
1359 #include "dispatch.h"
1360 #include "monitor.h"
1361+#include "xmalloc.h"
1362
1363 #include "ssherr.h"
1364 #include "sshbuf.h"
1365 #include "digest.h"
1366
1367+#ifdef GSSAPI
1368+#include "ssh-gss.h"
1369+#endif
1370+
1371 /* prototype */
1372 static int kex_choose_conf(struct ssh *);
1373 static int kex_input_newkeys(int, u_int32_t, struct ssh *);
1374@@ -113,15 +118,28 @@ static const struct kexalg kexalgs[] = {
1375 #endif /* HAVE_EVP_SHA256 || !WITH_OPENSSL */
1376 { NULL, 0, -1, -1},
1377 };
1378+static const struct kexalg gss_kexalgs[] = {
1379+#ifdef GSSAPI
1380+ { KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, SSH_DIGEST_SHA1 },
1381+ { KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },
1382+ { KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
1383+ { KEX_GSS_GRP14_SHA256_ID, KEX_GSS_GRP14_SHA256, 0, SSH_DIGEST_SHA256 },
1384+ { KEX_GSS_GRP16_SHA512_ID, KEX_GSS_GRP16_SHA512, 0, SSH_DIGEST_SHA512 },
1385+ { KEX_GSS_NISTP256_SHA256_ID, KEX_GSS_NISTP256_SHA256,
1386+ NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },
1387+ { KEX_GSS_C25519_SHA256_ID, KEX_GSS_C25519_SHA256, 0, SSH_DIGEST_SHA256 },
1388+#endif
1389+ { NULL, 0, -1, -1 },
1390+};
1391
1392-char *
1393-kex_alg_list(char sep)
1394+static char *
1395+kex_alg_list_internal(char sep, const struct kexalg *algs)
1396 {
1397 char *ret = NULL, *tmp;
1398 size_t nlen, rlen = 0;
1399 const struct kexalg *k;
1400
1401- for (k = kexalgs; k->name != NULL; k++) {
1402+ for (k = algs; k->name != NULL; k++) {
1403 if (ret != NULL)
1404 ret[rlen++] = sep;
1405 nlen = strlen(k->name);
1406@@ -136,6 +154,18 @@ kex_alg_list(char sep)
1407 return ret;
1408 }
1409
1410+char *
1411+kex_alg_list(char sep)
1412+{
1413+ return kex_alg_list_internal(sep, kexalgs);
1414+}
1415+
1416+char *
1417+kex_gss_alg_list(char sep)
1418+{
1419+ return kex_alg_list_internal(sep, gss_kexalgs);
1420+}
1421+
1422 static const struct kexalg *
1423 kex_alg_by_name(const char *name)
1424 {
1425@@ -145,6 +175,10 @@ kex_alg_by_name(const char *name)
1426 if (strcmp(k->name, name) == 0)
1427 return k;
1428 }
1429+ for (k = gss_kexalgs; k->name != NULL; k++) {
1430+ if (strncmp(k->name, name, strlen(k->name)) == 0)
1431+ return k;
1432+ }
1433 return NULL;
1434 }
1435
1436@@ -313,6 +347,29 @@ kex_assemble_names(char **listp, const char *def, const char *all)
1437 return r;
1438 }
1439
1440+/* Validate GSS KEX method name list */
1441+int
1442+kex_gss_names_valid(const char *names)
1443+{
1444+ char *s, *cp, *p;
1445+
1446+ if (names == NULL || *names == '\0')
1447+ return 0;
1448+ s = cp = xstrdup(names);
1449+ for ((p = strsep(&cp, ",")); p && *p != '\0';
1450+ (p = strsep(&cp, ","))) {
1451+ if (strncmp(p, "gss-", 4) != 0
1452+ || kex_alg_by_name(p) == NULL) {
1453+ error("Unsupported KEX algorithm \"%.100s\"", p);
1454+ free(s);
1455+ return 0;
1456+ }
1457+ }
1458+ debug3("gss kex names ok: [%s]", names);
1459+ free(s);
1460+ return 1;
1461+}
1462+
1463 /* put algorithm proposal into buffer */
1464 int
1465 kex_prop2buf(struct sshbuf *b, char *proposal[PROPOSAL_MAX])
1466@@ -696,6 +753,9 @@ kex_free(struct kex *kex)
1467 sshbuf_free(kex->server_version);
1468 sshbuf_free(kex->client_pub);
1469 free(kex->session_id);
1470+#ifdef GSSAPI
1471+ free(kex->gss_host);
1472+#endif /* GSSAPI */
1473 free(kex->failed_choice);
1474 free(kex->hostkey_alg);
1475 free(kex->name);
1476diff --git a/kex.h b/kex.h
1477index a5ae6ac05..fe7141414 100644
1478--- a/kex.h
1479+++ b/kex.h
1480@@ -102,6 +102,15 @@ enum kex_exchange {
1481 KEX_ECDH_SHA2,
1482 KEX_C25519_SHA256,
1483 KEX_KEM_SNTRUP4591761X25519_SHA512,
1484+#ifdef GSSAPI
1485+ KEX_GSS_GRP1_SHA1,
1486+ KEX_GSS_GRP14_SHA1,
1487+ KEX_GSS_GRP14_SHA256,
1488+ KEX_GSS_GRP16_SHA512,
1489+ KEX_GSS_GEX_SHA1,
1490+ KEX_GSS_NISTP256_SHA256,
1491+ KEX_GSS_C25519_SHA256,
1492+#endif
1493 KEX_MAX
1494 };
1495
1496@@ -153,6 +162,12 @@ struct kex {
1497 u_int flags;
1498 int hash_alg;
1499 int ec_nid;
1500+#ifdef GSSAPI
1501+ int gss_deleg_creds;
1502+ int gss_trust_dns;
1503+ char *gss_host;
1504+ char *gss_client;
1505+#endif
1506 char *failed_choice;
1507 int (*verify_host_key)(struct sshkey *, struct ssh *);
1508 struct sshkey *(*load_host_public_key)(int, int, struct ssh *);
1509@@ -174,8 +189,10 @@ struct kex {
1510
1511 int kex_names_valid(const char *);
1512 char *kex_alg_list(char);
1513+char *kex_gss_alg_list(char);
1514 char *kex_names_cat(const char *, const char *);
1515 int kex_assemble_names(char **, const char *, const char *);
1516+int kex_gss_names_valid(const char *);
1517
1518 int kex_exchange_identification(struct ssh *, int, const char *);
1519
1520@@ -202,6 +219,12 @@ int kexgex_client(struct ssh *);
1521 int kexgex_server(struct ssh *);
1522 int kex_gen_client(struct ssh *);
1523 int kex_gen_server(struct ssh *);
1524+#if defined(GSSAPI) && defined(WITH_OPENSSL)
1525+int kexgssgex_client(struct ssh *);
1526+int kexgssgex_server(struct ssh *);
1527+int kexgss_client(struct ssh *);
1528+int kexgss_server(struct ssh *);
1529+#endif
1530
1531 int kex_dh_keypair(struct kex *);
1532 int kex_dh_enc(struct kex *, const struct sshbuf *, struct sshbuf **,
1533@@ -234,6 +257,12 @@ int kexgex_hash(int, const struct sshbuf *, const struct sshbuf *,
1534 const BIGNUM *, const u_char *, size_t,
1535 u_char *, size_t *);
1536
1537+int kex_gen_hash(int hash_alg, const struct sshbuf *client_version,
1538+ const struct sshbuf *server_version, const struct sshbuf *client_kexinit,
1539+ const struct sshbuf *server_kexinit, const struct sshbuf *server_host_key_blob,
1540+ const struct sshbuf *client_pub, const struct sshbuf *server_pub,
1541+ const struct sshbuf *shared_secret, u_char *hash, size_t *hashlen);
1542+
1543 void kexc25519_keygen(u_char key[CURVE25519_SIZE], u_char pub[CURVE25519_SIZE])
1544 __attribute__((__bounded__(__minbytes__, 1, CURVE25519_SIZE)))
1545 __attribute__((__bounded__(__minbytes__, 2, CURVE25519_SIZE)));
1546diff --git a/kexdh.c b/kexdh.c
1547index 67133e339..edaa46762 100644
1548--- a/kexdh.c
1549+++ b/kexdh.c
1550@@ -48,13 +48,23 @@ kex_dh_keygen(struct kex *kex)
1551 {
1552 switch (kex->kex_type) {
1553 case KEX_DH_GRP1_SHA1:
1554+#ifdef GSSAPI
1555+ case KEX_GSS_GRP1_SHA1:
1556+#endif
1557 kex->dh = dh_new_group1();
1558 break;
1559 case KEX_DH_GRP14_SHA1:
1560 case KEX_DH_GRP14_SHA256:
1561+#ifdef GSSAPI
1562+ case KEX_GSS_GRP14_SHA1:
1563+ case KEX_GSS_GRP14_SHA256:
1564+#endif
1565 kex->dh = dh_new_group14();
1566 break;
1567 case KEX_DH_GRP16_SHA512:
1568+#ifdef GSSAPI
1569+ case KEX_GSS_GRP16_SHA512:
1570+#endif
1571 kex->dh = dh_new_group16();
1572 break;
1573 case KEX_DH_GRP18_SHA512:
1574diff --git a/kexgen.c b/kexgen.c
1575index bb996b504..d353ed8b0 100644
1576--- a/kexgen.c
1577+++ b/kexgen.c
1578@@ -44,7 +44,7 @@
1579 static int input_kex_gen_init(int, u_int32_t, struct ssh *);
1580 static int input_kex_gen_reply(int type, u_int32_t seq, struct ssh *ssh);
1581
1582-static int
1583+int
1584 kex_gen_hash(
1585 int hash_alg,
1586 const struct sshbuf *client_version,
1587diff --git a/kexgssc.c b/kexgssc.c
1588new file mode 100644
1589index 000000000..f6e1405eb
1590--- /dev/null
1591+++ b/kexgssc.c
1592@@ -0,0 +1,606 @@
1593+/*
1594+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
1595+ *
1596+ * Redistribution and use in source and binary forms, with or without
1597+ * modification, are permitted provided that the following conditions
1598+ * are met:
1599+ * 1. Redistributions of source code must retain the above copyright
1600+ * notice, this list of conditions and the following disclaimer.
1601+ * 2. Redistributions in binary form must reproduce the above copyright
1602+ * notice, this list of conditions and the following disclaimer in the
1603+ * documentation and/or other materials provided with the distribution.
1604+ *
1605+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
1606+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1607+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
1608+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
1609+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
1610+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1611+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1612+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1613+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
1614+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1615+ */
1616+
1617+#include "includes.h"
1618+
1619+#if defined(GSSAPI) && defined(WITH_OPENSSL)
1620+
1621+#include "includes.h"
1622+
1623+#include <openssl/crypto.h>
1624+#include <openssl/bn.h>
1625+
1626+#include <string.h>
1627+
1628+#include "xmalloc.h"
1629+#include "sshbuf.h"
1630+#include "ssh2.h"
1631+#include "sshkey.h"
1632+#include "cipher.h"
1633+#include "kex.h"
1634+#include "log.h"
1635+#include "packet.h"
1636+#include "dh.h"
1637+#include "digest.h"
1638+#include "ssherr.h"
1639+
1640+#include "ssh-gss.h"
1641+
1642+int
1643+kexgss_client(struct ssh *ssh)
1644+{
1645+ struct kex *kex = ssh->kex;
1646+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER,
1647+ recv_tok = GSS_C_EMPTY_BUFFER,
1648+ gssbuf, msg_tok = GSS_C_EMPTY_BUFFER, *token_ptr;
1649+ Gssctxt *ctxt;
1650+ OM_uint32 maj_status, min_status, ret_flags;
1651+ struct sshbuf *server_blob = NULL;
1652+ struct sshbuf *shared_secret = NULL;
1653+ struct sshbuf *server_host_key_blob = NULL;
1654+ struct sshbuf *empty = NULL;
1655+ u_char *msg;
1656+ int type = 0;
1657+ int first = 1;
1658+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1659+ size_t hashlen;
1660+ u_char c;
1661+ int r;
1662+
1663+ /* Initialise our GSSAPI world */
1664+ ssh_gssapi_build_ctx(&ctxt);
1665+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type)
1666+ == GSS_C_NO_OID)
1667+ fatal("Couldn't identify host exchange");
1668+
1669+ if (ssh_gssapi_import_name(ctxt, kex->gss_host))
1670+ fatal("Couldn't import hostname");
1671+
1672+ if (kex->gss_client &&
1673+ ssh_gssapi_client_identity(ctxt, kex->gss_client))
1674+ fatal("Couldn't acquire client credentials");
1675+
1676+ /* Step 1 */
1677+ switch (kex->kex_type) {
1678+ case KEX_GSS_GRP1_SHA1:
1679+ case KEX_GSS_GRP14_SHA1:
1680+ case KEX_GSS_GRP14_SHA256:
1681+ case KEX_GSS_GRP16_SHA512:
1682+ r = kex_dh_keypair(kex);
1683+ break;
1684+ case KEX_GSS_NISTP256_SHA256:
1685+ r = kex_ecdh_keypair(kex);
1686+ break;
1687+ case KEX_GSS_C25519_SHA256:
1688+ r = kex_c25519_keypair(kex);
1689+ break;
1690+ default:
1691+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
1692+ }
1693+ if (r != 0)
1694+ return r;
1695+
1696+ token_ptr = GSS_C_NO_BUFFER;
1697+
1698+ do {
1699+ debug("Calling gss_init_sec_context");
1700+
1701+ maj_status = ssh_gssapi_init_ctx(ctxt,
1702+ kex->gss_deleg_creds, token_ptr, &send_tok,
1703+ &ret_flags);
1704+
1705+ if (GSS_ERROR(maj_status)) {
1706+ /* XXX Useles code: Missing send? */
1707+ if (send_tok.length != 0) {
1708+ if ((r = sshpkt_start(ssh,
1709+ SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
1710+ (r = sshpkt_put_string(ssh, send_tok.value,
1711+ send_tok.length)) != 0)
1712+ fatal("sshpkt failed: %s", ssh_err(r));
1713+ }
1714+ fatal("gss_init_context failed");
1715+ }
1716+
1717+ /* If we've got an old receive buffer get rid of it */
1718+ if (token_ptr != GSS_C_NO_BUFFER)
1719+ gss_release_buffer(&min_status, &recv_tok);
1720+
1721+ if (maj_status == GSS_S_COMPLETE) {
1722+ /* If mutual state flag is not true, kex fails */
1723+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
1724+ fatal("Mutual authentication failed");
1725+
1726+ /* If integ avail flag is not true kex fails */
1727+ if (!(ret_flags & GSS_C_INTEG_FLAG))
1728+ fatal("Integrity check failed");
1729+ }
1730+
1731+ /*
1732+ * If we have data to send, then the last message that we
1733+ * received cannot have been a 'complete'.
1734+ */
1735+ if (send_tok.length != 0) {
1736+ if (first) {
1737+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_INIT)) != 0 ||
1738+ (r = sshpkt_put_string(ssh, send_tok.value,
1739+ send_tok.length)) != 0 ||
1740+ (r = sshpkt_put_stringb(ssh, kex->client_pub)) != 0)
1741+ fatal("failed to construct packet: %s", ssh_err(r));
1742+ first = 0;
1743+ } else {
1744+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
1745+ (r = sshpkt_put_string(ssh, send_tok.value,
1746+ send_tok.length)) != 0)
1747+ fatal("failed to construct packet: %s", ssh_err(r));
1748+ }
1749+ if ((r = sshpkt_send(ssh)) != 0)
1750+ fatal("failed to send packet: %s", ssh_err(r));
1751+ gss_release_buffer(&min_status, &send_tok);
1752+
1753+ /* If we've sent them data, they should reply */
1754+ do {
1755+ type = ssh_packet_read(ssh);
1756+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) {
1757+ debug("Received KEXGSS_HOSTKEY");
1758+ if (server_host_key_blob)
1759+ fatal("Server host key received more than once");
1760+ if ((r = sshpkt_getb_froms(ssh, &server_host_key_blob)) != 0)
1761+ fatal("Failed to read server host key: %s", ssh_err(r));
1762+ }
1763+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY);
1764+
1765+ switch (type) {
1766+ case SSH2_MSG_KEXGSS_CONTINUE:
1767+ debug("Received GSSAPI_CONTINUE");
1768+ if (maj_status == GSS_S_COMPLETE)
1769+ fatal("GSSAPI Continue received from server when complete");
1770+ if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
1771+ &recv_tok)) != 0 ||
1772+ (r = sshpkt_get_end(ssh)) != 0)
1773+ fatal("Failed to read token: %s", ssh_err(r));
1774+ break;
1775+ case SSH2_MSG_KEXGSS_COMPLETE:
1776+ debug("Received GSSAPI_COMPLETE");
1777+ if (msg_tok.value != NULL)
1778+ fatal("Received GSSAPI_COMPLETE twice?");
1779+ if ((r = sshpkt_getb_froms(ssh, &server_blob)) != 0 ||
1780+ (r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
1781+ &msg_tok)) != 0)
1782+ fatal("Failed to read message: %s", ssh_err(r));
1783+
1784+ /* Is there a token included? */
1785+ if ((r = sshpkt_get_u8(ssh, &c)) != 0)
1786+ fatal("sshpkt failed: %s", ssh_err(r));
1787+ if (c) {
1788+ if ((r = ssh_gssapi_sshpkt_get_buffer_desc(
1789+ ssh, &recv_tok)) != 0)
1790+ fatal("Failed to read token: %s", ssh_err(r));
1791+ /* If we're already complete - protocol error */
1792+ if (maj_status == GSS_S_COMPLETE)
1793+ sshpkt_disconnect(ssh, "Protocol error: received token when complete");
1794+ } else {
1795+ /* No token included */
1796+ if (maj_status != GSS_S_COMPLETE)
1797+ sshpkt_disconnect(ssh, "Protocol error: did not receive final token");
1798+ }
1799+ if ((r = sshpkt_get_end(ssh)) != 0) {
1800+ fatal("Expecting end of packet.");
1801+ }
1802+ break;
1803+ case SSH2_MSG_KEXGSS_ERROR:
1804+ debug("Received Error");
1805+ if ((r = sshpkt_get_u32(ssh, &maj_status)) != 0 ||
1806+ (r = sshpkt_get_u32(ssh, &min_status)) != 0 ||
1807+ (r = sshpkt_get_string(ssh, &msg, NULL)) != 0 ||
1808+ (r = sshpkt_get_string(ssh, NULL, NULL)) != 0 || /* lang tag */
1809+ (r = sshpkt_get_end(ssh)) != 0)
1810+ fatal("sshpkt_get failed: %s", ssh_err(r));
1811+ fatal("GSSAPI Error: \n%.400s", msg);
1812+ default:
1813+ sshpkt_disconnect(ssh, "Protocol error: didn't expect packet type %d",
1814+ type);
1815+ }
1816+ token_ptr = &recv_tok;
1817+ } else {
1818+ /* No data, and not complete */
1819+ if (maj_status != GSS_S_COMPLETE)
1820+ fatal("Not complete, and no token output");
1821+ }
1822+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
1823+
1824+ /*
1825+ * We _must_ have received a COMPLETE message in reply from the
1826+ * server, which will have set server_blob and msg_tok
1827+ */
1828+
1829+ if (type != SSH2_MSG_KEXGSS_COMPLETE)
1830+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it");
1831+
1832+ /* compute shared secret */
1833+ switch (kex->kex_type) {
1834+ case KEX_GSS_GRP1_SHA1:
1835+ case KEX_GSS_GRP14_SHA1:
1836+ case KEX_GSS_GRP14_SHA256:
1837+ case KEX_GSS_GRP16_SHA512:
1838+ r = kex_dh_dec(kex, server_blob, &shared_secret);
1839+ break;
1840+ case KEX_GSS_C25519_SHA256:
1841+ if (sshbuf_ptr(server_blob)[sshbuf_len(server_blob)] & 0x80)
1842+ fatal("The received key has MSB of last octet set!");
1843+ r = kex_c25519_dec(kex, server_blob, &shared_secret);
1844+ break;
1845+ case KEX_GSS_NISTP256_SHA256:
1846+ if (sshbuf_len(server_blob) != 65)
1847+ fatal("The received NIST-P256 key did not match"
1848+ "expected length (expected 65, got %zu)", sshbuf_len(server_blob));
1849+
1850+ if (sshbuf_ptr(server_blob)[0] != POINT_CONVERSION_UNCOMPRESSED)
1851+ fatal("The received NIST-P256 key does not have first octet 0x04");
1852+
1853+ r = kex_ecdh_dec(kex, server_blob, &shared_secret);
1854+ break;
1855+ default:
1856+ r = SSH_ERR_INVALID_ARGUMENT;
1857+ break;
1858+ }
1859+ if (r != 0)
1860+ goto out;
1861+
1862+ if ((empty = sshbuf_new()) == NULL) {
1863+ r = SSH_ERR_ALLOC_FAIL;
1864+ goto out;
1865+ }
1866+
1867+ hashlen = sizeof(hash);
1868+ if ((r = kex_gen_hash(
1869+ kex->hash_alg,
1870+ kex->client_version,
1871+ kex->server_version,
1872+ kex->my,
1873+ kex->peer,
1874+ (server_host_key_blob ? server_host_key_blob : empty),
1875+ kex->client_pub,
1876+ server_blob,
1877+ shared_secret,
1878+ hash, &hashlen)) != 0)
1879+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
1880+
1881+ gssbuf.value = hash;
1882+ gssbuf.length = hashlen;
1883+
1884+ /* Verify that the hash matches the MIC we just got. */
1885+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
1886+ sshpkt_disconnect(ssh, "Hash's MIC didn't verify");
1887+
1888+ gss_release_buffer(&min_status, &msg_tok);
1889+
1890+ if (kex->gss_deleg_creds)
1891+ ssh_gssapi_credentials_updated(ctxt);
1892+
1893+ if (gss_kex_context == NULL)
1894+ gss_kex_context = ctxt;
1895+ else
1896+ ssh_gssapi_delete_ctx(&ctxt);
1897+
1898+ if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
1899+ r = kex_send_newkeys(ssh);
1900+
1901+out:
1902+ explicit_bzero(hash, sizeof(hash));
1903+ explicit_bzero(kex->c25519_client_key, sizeof(kex->c25519_client_key));
1904+ sshbuf_free(empty);
1905+ sshbuf_free(server_host_key_blob);
1906+ sshbuf_free(server_blob);
1907+ sshbuf_free(shared_secret);
1908+ sshbuf_free(kex->client_pub);
1909+ kex->client_pub = NULL;
1910+ return r;
1911+}
1912+
1913+int
1914+kexgssgex_client(struct ssh *ssh)
1915+{
1916+ struct kex *kex = ssh->kex;
1917+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER,
1918+ recv_tok = GSS_C_EMPTY_BUFFER, gssbuf,
1919+ msg_tok = GSS_C_EMPTY_BUFFER, *token_ptr;
1920+ Gssctxt *ctxt;
1921+ OM_uint32 maj_status, min_status, ret_flags;
1922+ struct sshbuf *shared_secret = NULL;
1923+ BIGNUM *p = NULL;
1924+ BIGNUM *g = NULL;
1925+ struct sshbuf *buf = NULL;
1926+ struct sshbuf *server_host_key_blob = NULL;
1927+ struct sshbuf *server_blob = NULL;
1928+ BIGNUM *dh_server_pub = NULL;
1929+ u_char *msg;
1930+ int type = 0;
1931+ int first = 1;
1932+ u_char hash[SSH_DIGEST_MAX_LENGTH];
1933+ size_t hashlen;
1934+ const BIGNUM *pub_key, *dh_p, *dh_g;
1935+ int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX;
1936+ struct sshbuf *empty = NULL;
1937+ u_char c;
1938+ int r;
1939+
1940+ /* Initialise our GSSAPI world */
1941+ ssh_gssapi_build_ctx(&ctxt);
1942+ if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type)
1943+ == GSS_C_NO_OID)
1944+ fatal("Couldn't identify host exchange");
1945+
1946+ if (ssh_gssapi_import_name(ctxt, kex->gss_host))
1947+ fatal("Couldn't import hostname");
1948+
1949+ if (kex->gss_client &&
1950+ ssh_gssapi_client_identity(ctxt, kex->gss_client))
1951+ fatal("Couldn't acquire client credentials");
1952+
1953+ debug("Doing group exchange");
1954+ nbits = dh_estimate(kex->dh_need * 8);
1955+
1956+ kex->min = DH_GRP_MIN;
1957+ kex->max = DH_GRP_MAX;
1958+ kex->nbits = nbits;
1959+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_GROUPREQ)) != 0 ||
1960+ (r = sshpkt_put_u32(ssh, min)) != 0 ||
1961+ (r = sshpkt_put_u32(ssh, nbits)) != 0 ||
1962+ (r = sshpkt_put_u32(ssh, max)) != 0 ||
1963+ (r = sshpkt_send(ssh)) != 0)
1964+ fatal("Failed to construct a packet: %s", ssh_err(r));
1965+
1966+ if ((r = ssh_packet_read_expect(ssh, SSH2_MSG_KEXGSS_GROUP)) != 0)
1967+ fatal("Error: %s", ssh_err(r));
1968+
1969+ if ((r = sshpkt_get_bignum2(ssh, &p)) != 0 ||
1970+ (r = sshpkt_get_bignum2(ssh, &g)) != 0 ||
1971+ (r = sshpkt_get_end(ssh)) != 0)
1972+ fatal("shpkt_get_bignum2 failed: %s", ssh_err(r));
1973+
1974+ if (BN_num_bits(p) < min || BN_num_bits(p) > max)
1975+ fatal("GSSGRP_GEX group out of range: %d !< %d !< %d",
1976+ min, BN_num_bits(p), max);
1977+
1978+ if ((kex->dh = dh_new_group(g, p)) == NULL)
1979+ fatal("dn_new_group() failed");
1980+ p = g = NULL; /* belong to kex->dh now */
1981+
1982+ if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0)
1983+ goto out;
1984+ DH_get0_key(kex->dh, &pub_key, NULL);
1985+
1986+ token_ptr = GSS_C_NO_BUFFER;
1987+
1988+ do {
1989+ /* Step 2 - call GSS_Init_sec_context() */
1990+ debug("Calling gss_init_sec_context");
1991+
1992+ maj_status = ssh_gssapi_init_ctx(ctxt,
1993+ kex->gss_deleg_creds, token_ptr, &send_tok,
1994+ &ret_flags);
1995+
1996+ if (GSS_ERROR(maj_status)) {
1997+ /* XXX Useles code: Missing send? */
1998+ if (send_tok.length != 0) {
1999+ if ((r = sshpkt_start(ssh,
2000+ SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
2001+ (r = sshpkt_put_string(ssh, send_tok.value,
2002+ send_tok.length)) != 0)
2003+ fatal("sshpkt failed: %s", ssh_err(r));
2004+ }
2005+ fatal("gss_init_context failed");
2006+ }
2007+
2008+ /* If we've got an old receive buffer get rid of it */
2009+ if (token_ptr != GSS_C_NO_BUFFER)
2010+ gss_release_buffer(&min_status, &recv_tok);
2011+
2012+ if (maj_status == GSS_S_COMPLETE) {
2013+ /* If mutual state flag is not true, kex fails */
2014+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
2015+ fatal("Mutual authentication failed");
2016+
2017+ /* If integ avail flag is not true kex fails */
2018+ if (!(ret_flags & GSS_C_INTEG_FLAG))
2019+ fatal("Integrity check failed");
2020+ }
2021+
2022+ /*
2023+ * If we have data to send, then the last message that we
2024+ * received cannot have been a 'complete'.
2025+ */
2026+ if (send_tok.length != 0) {
2027+ if (first) {
2028+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_INIT)) != 0 ||
2029+ (r = sshpkt_put_string(ssh, send_tok.value,
2030+ send_tok.length)) != 0 ||
2031+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0)
2032+ fatal("sshpkt failed: %s", ssh_err(r));
2033+ first = 0;
2034+ } else {
2035+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
2036+ (r = sshpkt_put_string(ssh,send_tok.value,
2037+ send_tok.length)) != 0)
2038+ fatal("sshpkt failed: %s", ssh_err(r));
2039+ }
2040+ if ((r = sshpkt_send(ssh)) != 0)
2041+ fatal("sshpkt_send failed: %s", ssh_err(r));
2042+ gss_release_buffer(&min_status, &send_tok);
2043+
2044+ /* If we've sent them data, they should reply */
2045+ do {
2046+ type = ssh_packet_read(ssh);
2047+ if (type == SSH2_MSG_KEXGSS_HOSTKEY) {
2048+ debug("Received KEXGSS_HOSTKEY");
2049+ if (server_host_key_blob)
2050+ fatal("Server host key received more than once");
2051+ if ((r = sshpkt_getb_froms(ssh, &server_host_key_blob)) != 0)
2052+ fatal("sshpkt failed: %s", ssh_err(r));
2053+ }
2054+ } while (type == SSH2_MSG_KEXGSS_HOSTKEY);
2055+
2056+ switch (type) {
2057+ case SSH2_MSG_KEXGSS_CONTINUE:
2058+ debug("Received GSSAPI_CONTINUE");
2059+ if (maj_status == GSS_S_COMPLETE)
2060+ fatal("GSSAPI Continue received from server when complete");
2061+ if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
2062+ &recv_tok)) != 0 ||
2063+ (r = sshpkt_get_end(ssh)) != 0)
2064+ fatal("sshpkt failed: %s", ssh_err(r));
2065+ break;
2066+ case SSH2_MSG_KEXGSS_COMPLETE:
2067+ debug("Received GSSAPI_COMPLETE");
2068+ if (msg_tok.value != NULL)
2069+ fatal("Received GSSAPI_COMPLETE twice?");
2070+ if ((r = sshpkt_getb_froms(ssh, &server_blob)) != 0 ||
2071+ (r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
2072+ &msg_tok)) != 0)
2073+ fatal("sshpkt failed: %s", ssh_err(r));
2074+
2075+ /* Is there a token included? */
2076+ if ((r = sshpkt_get_u8(ssh, &c)) != 0)
2077+ fatal("sshpkt failed: %s", ssh_err(r));
2078+ if (c) {
2079+ if ((r = ssh_gssapi_sshpkt_get_buffer_desc(
2080+ ssh, &recv_tok)) != 0 ||
2081+ (r = sshpkt_get_end(ssh)) != 0)
2082+ fatal("sshpkt failed: %s", ssh_err(r));
2083+ /* If we're already complete - protocol error */
2084+ if (maj_status == GSS_S_COMPLETE)
2085+ sshpkt_disconnect(ssh, "Protocol error: received token when complete");
2086+ } else {
2087+ /* No token included */
2088+ if (maj_status != GSS_S_COMPLETE)
2089+ sshpkt_disconnect(ssh, "Protocol error: did not receive final token");
2090+ }
2091+ break;
2092+ case SSH2_MSG_KEXGSS_ERROR:
2093+ debug("Received Error");
2094+ if ((r = sshpkt_get_u32(ssh, &maj_status)) != 0 ||
2095+ (r = sshpkt_get_u32(ssh, &min_status)) != 0 ||
2096+ (r = sshpkt_get_string(ssh, &msg, NULL)) != 0 ||
2097+ (r = sshpkt_get_string(ssh, NULL, NULL)) != 0 || /* lang tag */
2098+ (r = sshpkt_get_end(ssh)) != 0)
2099+ fatal("sshpkt failed: %s", ssh_err(r));
2100+ fatal("GSSAPI Error: \n%.400s", msg);
2101+ default:
2102+ sshpkt_disconnect(ssh, "Protocol error: didn't expect packet type %d",
2103+ type);
2104+ }
2105+ token_ptr = &recv_tok;
2106+ } else {
2107+ /* No data, and not complete */
2108+ if (maj_status != GSS_S_COMPLETE)
2109+ fatal("Not complete, and no token output");
2110+ }
2111+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
2112+
2113+ /*
2114+ * We _must_ have received a COMPLETE message in reply from the
2115+ * server, which will have set dh_server_pub and msg_tok
2116+ */
2117+
2118+ if (type != SSH2_MSG_KEXGSS_COMPLETE)
2119+ fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it");
2120+
2121+ /* 7. C verifies that the key Q_S is valid */
2122+ /* 8. C computes shared secret */
2123+ if ((buf = sshbuf_new()) == NULL ||
2124+ (r = sshbuf_put_stringb(buf, server_blob)) != 0 ||
2125+ (r = sshbuf_get_bignum2(buf, &dh_server_pub)) != 0)
2126+ goto out;
2127+ sshbuf_free(buf);
2128+ buf = NULL;
2129+
2130+ if ((shared_secret = sshbuf_new()) == NULL) {
2131+ r = SSH_ERR_ALLOC_FAIL;
2132+ goto out;
2133+ }
2134+
2135+ if ((r = kex_dh_compute_key(kex, dh_server_pub, shared_secret)) != 0)
2136+ goto out;
2137+ if ((empty = sshbuf_new()) == NULL) {
2138+ r = SSH_ERR_ALLOC_FAIL;
2139+ goto out;
2140+ }
2141+
2142+ DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
2143+ hashlen = sizeof(hash);
2144+ if ((r = kexgex_hash(
2145+ kex->hash_alg,
2146+ kex->client_version,
2147+ kex->server_version,
2148+ kex->my,
2149+ kex->peer,
2150+ (server_host_key_blob ? server_host_key_blob : empty),
2151+ kex->min, kex->nbits, kex->max,
2152+ dh_p, dh_g,
2153+ pub_key,
2154+ dh_server_pub,
2155+ sshbuf_ptr(shared_secret), sshbuf_len(shared_secret),
2156+ hash, &hashlen)) != 0)
2157+ fatal("Failed to calculate hash: %s", ssh_err(r));
2158+
2159+ gssbuf.value = hash;
2160+ gssbuf.length = hashlen;
2161+
2162+ /* Verify that the hash matches the MIC we just got. */
2163+ if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok)))
2164+ sshpkt_disconnect(ssh, "Hash's MIC didn't verify");
2165+
2166+ gss_release_buffer(&min_status, &msg_tok);
2167+
2168+ /* save session id */
2169+ if (kex->session_id == NULL) {
2170+ kex->session_id_len = hashlen;
2171+ kex->session_id = xmalloc(kex->session_id_len);
2172+ memcpy(kex->session_id, hash, kex->session_id_len);
2173+ }
2174+
2175+ if (kex->gss_deleg_creds)
2176+ ssh_gssapi_credentials_updated(ctxt);
2177+
2178+ if (gss_kex_context == NULL)
2179+ gss_kex_context = ctxt;
2180+ else
2181+ ssh_gssapi_delete_ctx(&ctxt);
2182+
2183+ /* Finally derive the keys and send them */
2184+ if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
2185+ r = kex_send_newkeys(ssh);
2186+out:
2187+ sshbuf_free(buf);
2188+ sshbuf_free(server_blob);
2189+ sshbuf_free(empty);
2190+ explicit_bzero(hash, sizeof(hash));
2191+ DH_free(kex->dh);
2192+ kex->dh = NULL;
2193+ BN_clear_free(dh_server_pub);
2194+ sshbuf_free(shared_secret);
2195+ sshbuf_free(server_host_key_blob);
2196+ return r;
2197+}
2198+#endif /* defined(GSSAPI) && defined(WITH_OPENSSL) */
2199diff --git a/kexgsss.c b/kexgsss.c
2200new file mode 100644
2201index 000000000..60bc02deb
2202--- /dev/null
2203+++ b/kexgsss.c
2204@@ -0,0 +1,474 @@
2205+/*
2206+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
2207+ *
2208+ * Redistribution and use in source and binary forms, with or without
2209+ * modification, are permitted provided that the following conditions
2210+ * are met:
2211+ * 1. Redistributions of source code must retain the above copyright
2212+ * notice, this list of conditions and the following disclaimer.
2213+ * 2. Redistributions in binary form must reproduce the above copyright
2214+ * notice, this list of conditions and the following disclaimer in the
2215+ * documentation and/or other materials provided with the distribution.
2216+ *
2217+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
2218+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
2219+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
2220+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
2221+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
2222+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
2223+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
2224+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
2225+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
2226+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2227+ */
2228+
2229+#include "includes.h"
2230+
2231+#if defined(GSSAPI) && defined(WITH_OPENSSL)
2232+
2233+#include <string.h>
2234+
2235+#include <openssl/crypto.h>
2236+#include <openssl/bn.h>
2237+
2238+#include "xmalloc.h"
2239+#include "sshbuf.h"
2240+#include "ssh2.h"
2241+#include "sshkey.h"
2242+#include "cipher.h"
2243+#include "kex.h"
2244+#include "log.h"
2245+#include "packet.h"
2246+#include "dh.h"
2247+#include "ssh-gss.h"
2248+#include "monitor_wrap.h"
2249+#include "misc.h" /* servconf.h needs misc.h for struct ForwardOptions */
2250+#include "servconf.h"
2251+#include "ssh-gss.h"
2252+#include "digest.h"
2253+#include "ssherr.h"
2254+
2255+extern ServerOptions options;
2256+
2257+int
2258+kexgss_server(struct ssh *ssh)
2259+{
2260+ struct kex *kex = ssh->kex;
2261+ OM_uint32 maj_status, min_status;
2262+
2263+ /*
2264+ * Some GSSAPI implementations use the input value of ret_flags (an
2265+ * output variable) as a means of triggering mechanism specific
2266+ * features. Initializing it to zero avoids inadvertently
2267+ * activating this non-standard behaviour.
2268+ */
2269+
2270+ OM_uint32 ret_flags = 0;
2271+ gss_buffer_desc gssbuf, recv_tok, msg_tok;
2272+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
2273+ Gssctxt *ctxt = NULL;
2274+ struct sshbuf *shared_secret = NULL;
2275+ struct sshbuf *client_pubkey = NULL;
2276+ struct sshbuf *server_pubkey = NULL;
2277+ struct sshbuf *empty = sshbuf_new();
2278+ int type = 0;
2279+ gss_OID oid;
2280+ char *mechs;
2281+ u_char hash[SSH_DIGEST_MAX_LENGTH];
2282+ size_t hashlen;
2283+ int r;
2284+
2285+ /* Initialise GSSAPI */
2286+
2287+ /* If we're rekeying, privsep means that some of the private structures
2288+ * in the GSSAPI code are no longer available. This kludges them back
2289+ * into life
2290+ */
2291+ if (!ssh_gssapi_oid_table_ok()) {
2292+ mechs = ssh_gssapi_server_mechanisms();
2293+ free(mechs);
2294+ }
2295+
2296+ debug2("%s: Identifying %s", __func__, kex->name);
2297+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type);
2298+ if (oid == GSS_C_NO_OID)
2299+ fatal("Unknown gssapi mechanism");
2300+
2301+ debug2("%s: Acquiring credentials", __func__);
2302+
2303+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
2304+ fatal("Unable to acquire credentials for the server");
2305+
2306+ do {
2307+ debug("Wait SSH2_MSG_KEXGSS_INIT");
2308+ type = ssh_packet_read(ssh);
2309+ switch(type) {
2310+ case SSH2_MSG_KEXGSS_INIT:
2311+ if (client_pubkey != NULL)
2312+ fatal("Received KEXGSS_INIT after initialising");
2313+ if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
2314+ &recv_tok)) != 0 ||
2315+ (r = sshpkt_getb_froms(ssh, &client_pubkey)) != 0 ||
2316+ (r = sshpkt_get_end(ssh)) != 0)
2317+ fatal("sshpkt failed: %s", ssh_err(r));
2318+
2319+ switch (kex->kex_type) {
2320+ case KEX_GSS_GRP1_SHA1:
2321+ case KEX_GSS_GRP14_SHA1:
2322+ case KEX_GSS_GRP14_SHA256:
2323+ case KEX_GSS_GRP16_SHA512:
2324+ r = kex_dh_enc(kex, client_pubkey, &server_pubkey,
2325+ &shared_secret);
2326+ break;
2327+ case KEX_GSS_NISTP256_SHA256:
2328+ r = kex_ecdh_enc(kex, client_pubkey, &server_pubkey,
2329+ &shared_secret);
2330+ break;
2331+ case KEX_GSS_C25519_SHA256:
2332+ r = kex_c25519_enc(kex, client_pubkey, &server_pubkey,
2333+ &shared_secret);
2334+ break;
2335+ default:
2336+ fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type);
2337+ }
2338+ if (r != 0)
2339+ goto out;
2340+
2341+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
2342+ break;
2343+ case SSH2_MSG_KEXGSS_CONTINUE:
2344+ if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
2345+ &recv_tok)) != 0 ||
2346+ (r = sshpkt_get_end(ssh)) != 0)
2347+ fatal("sshpkt failed: %s", ssh_err(r));
2348+ break;
2349+ default:
2350+ sshpkt_disconnect(ssh,
2351+ "Protocol error: didn't expect packet type %d",
2352+ type);
2353+ }
2354+
2355+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok,
2356+ &send_tok, &ret_flags));
2357+
2358+ gss_release_buffer(&min_status, &recv_tok);
2359+
2360+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
2361+ fatal("Zero length token output when incomplete");
2362+
2363+ if (client_pubkey == NULL)
2364+ fatal("No client public key");
2365+
2366+ if (maj_status & GSS_S_CONTINUE_NEEDED) {
2367+ debug("Sending GSSAPI_CONTINUE");
2368+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
2369+ (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0 ||
2370+ (r = sshpkt_send(ssh)) != 0)
2371+ fatal("sshpkt failed: %s", ssh_err(r));
2372+ gss_release_buffer(&min_status, &send_tok);
2373+ }
2374+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
2375+
2376+ if (GSS_ERROR(maj_status)) {
2377+ if (send_tok.length > 0) {
2378+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
2379+ (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0 ||
2380+ (r = sshpkt_send(ssh)) != 0)
2381+ fatal("sshpkt failed: %s", ssh_err(r));
2382+ }
2383+ fatal("accept_ctx died");
2384+ }
2385+
2386+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
2387+ fatal("Mutual Authentication flag wasn't set");
2388+
2389+ if (!(ret_flags & GSS_C_INTEG_FLAG))
2390+ fatal("Integrity flag wasn't set");
2391+
2392+ hashlen = sizeof(hash);
2393+ if ((r = kex_gen_hash(
2394+ kex->hash_alg,
2395+ kex->client_version,
2396+ kex->server_version,
2397+ kex->peer,
2398+ kex->my,
2399+ empty,
2400+ client_pubkey,
2401+ server_pubkey,
2402+ shared_secret,
2403+ hash, &hashlen)) != 0)
2404+ goto out;
2405+
2406+ gssbuf.value = hash;
2407+ gssbuf.length = hashlen;
2408+
2409+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt, &gssbuf, &msg_tok))))
2410+ fatal("Couldn't get MIC");
2411+
2412+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_COMPLETE)) != 0 ||
2413+ (r = sshpkt_put_stringb(ssh, server_pubkey)) != 0 ||
2414+ (r = sshpkt_put_string(ssh, msg_tok.value, msg_tok.length)) != 0)
2415+ fatal("sshpkt failed: %s", ssh_err(r));
2416+
2417+ if (send_tok.length != 0) {
2418+ if ((r = sshpkt_put_u8(ssh, 1)) != 0 || /* true */
2419+ (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0)
2420+ fatal("sshpkt failed: %s", ssh_err(r));
2421+ } else {
2422+ if ((r = sshpkt_put_u8(ssh, 0)) != 0) /* false */
2423+ fatal("sshpkt failed: %s", ssh_err(r));
2424+ }
2425+ if ((r = sshpkt_send(ssh)) != 0)
2426+ fatal("sshpkt_send failed: %s", ssh_err(r));
2427+
2428+ gss_release_buffer(&min_status, &send_tok);
2429+ gss_release_buffer(&min_status, &msg_tok);
2430+
2431+ if (gss_kex_context == NULL)
2432+ gss_kex_context = ctxt;
2433+ else
2434+ ssh_gssapi_delete_ctx(&ctxt);
2435+
2436+ if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
2437+ r = kex_send_newkeys(ssh);
2438+
2439+ /* If this was a rekey, then save out any delegated credentials we
2440+ * just exchanged. */
2441+ if (options.gss_store_rekey)
2442+ ssh_gssapi_rekey_creds();
2443+out:
2444+ sshbuf_free(empty);
2445+ explicit_bzero(hash, sizeof(hash));
2446+ sshbuf_free(shared_secret);
2447+ sshbuf_free(client_pubkey);
2448+ sshbuf_free(server_pubkey);
2449+ return r;
2450+}
2451+
2452+int
2453+kexgssgex_server(struct ssh *ssh)
2454+{
2455+ struct kex *kex = ssh->kex;
2456+ OM_uint32 maj_status, min_status;
2457+
2458+ /*
2459+ * Some GSSAPI implementations use the input value of ret_flags (an
2460+ * output variable) as a means of triggering mechanism specific
2461+ * features. Initializing it to zero avoids inadvertently
2462+ * activating this non-standard behaviour.
2463+ */
2464+
2465+ OM_uint32 ret_flags = 0;
2466+ gss_buffer_desc gssbuf, recv_tok, msg_tok;
2467+ gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
2468+ Gssctxt *ctxt = NULL;
2469+ struct sshbuf *shared_secret = NULL;
2470+ int type = 0;
2471+ gss_OID oid;
2472+ char *mechs;
2473+ u_char hash[SSH_DIGEST_MAX_LENGTH];
2474+ size_t hashlen;
2475+ BIGNUM *dh_client_pub = NULL;
2476+ const BIGNUM *pub_key, *dh_p, *dh_g;
2477+ int min = -1, max = -1, nbits = -1;
2478+ int cmin = -1, cmax = -1; /* client proposal */
2479+ struct sshbuf *empty = sshbuf_new();
2480+ int r;
2481+
2482+ /* Initialise GSSAPI */
2483+
2484+ /* If we're rekeying, privsep means that some of the private structures
2485+ * in the GSSAPI code are no longer available. This kludges them back
2486+ * into life
2487+ */
2488+ if (!ssh_gssapi_oid_table_ok())
2489+ if ((mechs = ssh_gssapi_server_mechanisms()))
2490+ free(mechs);
2491+
2492+ debug2("%s: Identifying %s", __func__, kex->name);
2493+ oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type);
2494+ if (oid == GSS_C_NO_OID)
2495+ fatal("Unknown gssapi mechanism");
2496+
2497+ debug2("%s: Acquiring credentials", __func__);
2498+
2499+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid))))
2500+ fatal("Unable to acquire credentials for the server");
2501+
2502+ /* 5. S generates an ephemeral key pair (do the allocations early) */
2503+ debug("Doing group exchange");
2504+ ssh_packet_read_expect(ssh, SSH2_MSG_KEXGSS_GROUPREQ);
2505+ /* store client proposal to provide valid signature */
2506+ if ((r = sshpkt_get_u32(ssh, &cmin)) != 0 ||
2507+ (r = sshpkt_get_u32(ssh, &nbits)) != 0 ||
2508+ (r = sshpkt_get_u32(ssh, &cmax)) != 0 ||
2509+ (r = sshpkt_get_end(ssh)) != 0)
2510+ fatal("sshpkt failed: %s", ssh_err(r));
2511+ kex->nbits = nbits;
2512+ kex->min = cmin;
2513+ kex->max = cmax;
2514+ min = MAX(DH_GRP_MIN, cmin);
2515+ max = MIN(DH_GRP_MAX, cmax);
2516+ nbits = MAXIMUM(DH_GRP_MIN, nbits);
2517+ nbits = MINIMUM(DH_GRP_MAX, nbits);
2518+ if (max < min || nbits < min || max < nbits)
2519+ fatal("GSS_GEX, bad parameters: %d !< %d !< %d",
2520+ min, nbits, max);
2521+ kex->dh = PRIVSEP(choose_dh(min, nbits, max));
2522+ if (kex->dh == NULL) {
2523+ sshpkt_disconnect(ssh, "Protocol error: no matching group found");
2524+ fatal("Protocol error: no matching group found");
2525+ }
2526+
2527+ DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
2528+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_GROUP)) != 0 ||
2529+ (r = sshpkt_put_bignum2(ssh, dh_p)) != 0 ||
2530+ (r = sshpkt_put_bignum2(ssh, dh_g)) != 0 ||
2531+ (r = sshpkt_send(ssh)) != 0)
2532+ fatal("sshpkt failed: %s", ssh_err(r));
2533+
2534+ if ((r = ssh_packet_write_wait(ssh)) != 0)
2535+ fatal("ssh_packet_write_wait: %s", ssh_err(r));
2536+
2537+ /* Compute our exchange value in parallel with the client */
2538+ if ((r = dh_gen_key(kex->dh, kex->we_need * 8)) != 0)
2539+ goto out;
2540+
2541+ do {
2542+ debug("Wait SSH2_MSG_GSSAPI_INIT");
2543+ type = ssh_packet_read(ssh);
2544+ switch(type) {
2545+ case SSH2_MSG_KEXGSS_INIT:
2546+ if (dh_client_pub != NULL)
2547+ fatal("Received KEXGSS_INIT after initialising");
2548+ if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
2549+ &recv_tok)) != 0 ||
2550+ (r = sshpkt_get_bignum2(ssh, &dh_client_pub)) != 0 ||
2551+ (r = sshpkt_get_end(ssh)) != 0)
2552+ fatal("sshpkt failed: %s", ssh_err(r));
2553+
2554+ /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */
2555+ break;
2556+ case SSH2_MSG_KEXGSS_CONTINUE:
2557+ if ((r = ssh_gssapi_sshpkt_get_buffer_desc(ssh,
2558+ &recv_tok)) != 0 ||
2559+ (r = sshpkt_get_end(ssh)) != 0)
2560+ fatal("sshpkt failed: %s", ssh_err(r));
2561+ break;
2562+ default:
2563+ sshpkt_disconnect(ssh,
2564+ "Protocol error: didn't expect packet type %d",
2565+ type);
2566+ }
2567+
2568+ maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok,
2569+ &send_tok, &ret_flags));
2570+
2571+ gss_release_buffer(&min_status, &recv_tok);
2572+
2573+ if (maj_status != GSS_S_COMPLETE && send_tok.length == 0)
2574+ fatal("Zero length token output when incomplete");
2575+
2576+ if (dh_client_pub == NULL)
2577+ fatal("No client public key");
2578+
2579+ if (maj_status & GSS_S_CONTINUE_NEEDED) {
2580+ debug("Sending GSSAPI_CONTINUE");
2581+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
2582+ (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0 ||
2583+ (r = sshpkt_send(ssh)) != 0)
2584+ fatal("sshpkt failed: %s", ssh_err(r));
2585+ gss_release_buffer(&min_status, &send_tok);
2586+ }
2587+ } while (maj_status & GSS_S_CONTINUE_NEEDED);
2588+
2589+ if (GSS_ERROR(maj_status)) {
2590+ if (send_tok.length > 0) {
2591+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_CONTINUE)) != 0 ||
2592+ (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0 ||
2593+ (r = sshpkt_send(ssh)) != 0)
2594+ fatal("sshpkt failed: %s", ssh_err(r));
2595+ }
2596+ fatal("accept_ctx died");
2597+ }
2598+
2599+ if (!(ret_flags & GSS_C_MUTUAL_FLAG))
2600+ fatal("Mutual Authentication flag wasn't set");
2601+
2602+ if (!(ret_flags & GSS_C_INTEG_FLAG))
2603+ fatal("Integrity flag wasn't set");
2604+
2605+ /* calculate shared secret */
2606+ if ((shared_secret = sshbuf_new()) == NULL) {
2607+ r = SSH_ERR_ALLOC_FAIL;
2608+ goto out;
2609+ }
2610+ if ((r = kex_dh_compute_key(kex, dh_client_pub, shared_secret)) != 0)
2611+ goto out;
2612+
2613+ DH_get0_key(kex->dh, &pub_key, NULL);
2614+ DH_get0_pqg(kex->dh, &dh_p, NULL, &dh_g);
2615+ hashlen = sizeof(hash);
2616+ if ((r = kexgex_hash(
2617+ kex->hash_alg,
2618+ kex->client_version,
2619+ kex->server_version,
2620+ kex->peer,
2621+ kex->my,
2622+ empty,
2623+ cmin, nbits, cmax,
2624+ dh_p, dh_g,
2625+ dh_client_pub,
2626+ pub_key,
2627+ sshbuf_ptr(shared_secret), sshbuf_len(shared_secret),
2628+ hash, &hashlen)) != 0)
2629+ fatal("kexgex_hash failed: %s", ssh_err(r));
2630+
2631+ gssbuf.value = hash;
2632+ gssbuf.length = hashlen;
2633+
2634+ if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt, &gssbuf, &msg_tok))))
2635+ fatal("Couldn't get MIC");
2636+
2637+ if ((r = sshpkt_start(ssh, SSH2_MSG_KEXGSS_COMPLETE)) != 0 ||
2638+ (r = sshpkt_put_bignum2(ssh, pub_key)) != 0 ||
2639+ (r = sshpkt_put_string(ssh, msg_tok.value, msg_tok.length)) != 0)
2640+ fatal("sshpkt failed: %s", ssh_err(r));
2641+
2642+ if (send_tok.length != 0) {
2643+ if ((r = sshpkt_put_u8(ssh, 1)) != 0 || /* true */
2644+ (r = sshpkt_put_string(ssh, send_tok.value, send_tok.length)) != 0)
2645+ fatal("sshpkt failed: %s", ssh_err(r));
2646+ } else {
2647+ if ((r = sshpkt_put_u8(ssh, 0)) != 0) /* false */
2648+ fatal("sshpkt failed: %s", ssh_err(r));
2649+ }
2650+ if ((r = sshpkt_send(ssh)) != 0)
2651+ fatal("sshpkt failed: %s", ssh_err(r));
2652+
2653+ gss_release_buffer(&min_status, &send_tok);
2654+ gss_release_buffer(&min_status, &msg_tok);
2655+
2656+ if (gss_kex_context == NULL)
2657+ gss_kex_context = ctxt;
2658+ else
2659+ ssh_gssapi_delete_ctx(&ctxt);
2660+
2661+ /* Finally derive the keys and send them */
2662+ if ((r = kex_derive_keys(ssh, hash, hashlen, shared_secret)) == 0)
2663+ r = kex_send_newkeys(ssh);
2664+
2665+ /* If this was a rekey, then save out any delegated credentials we
2666+ * just exchanged. */
2667+ if (options.gss_store_rekey)
2668+ ssh_gssapi_rekey_creds();
2669+out:
2670+ sshbuf_free(empty);
2671+ explicit_bzero(hash, sizeof(hash));
2672+ DH_free(kex->dh);
2673+ kex->dh = NULL;
2674+ BN_clear_free(dh_client_pub);
2675+ sshbuf_free(shared_secret);
2676+ return r;
2677+}
2678+#endif /* defined(GSSAPI) && defined(WITH_OPENSSL) */
2679diff --git a/mac.c b/mac.c
2680index f3dda6692..de346ed20 100644
2681--- a/mac.c
2682+++ b/mac.c
2683@@ -30,6 +30,7 @@
2684 #include <stdlib.h>
2685 #include <string.h>
2686 #include <stdio.h>
2687+#include <stdlib.h>
2688
2689 #include "digest.h"
2690 #include "hmac.h"
2691diff --git a/monitor.c b/monitor.c
2692index 00af44f98..bead9e204 100644
2693--- a/monitor.c
2694+++ b/monitor.c
2695@@ -147,6 +147,8 @@ int mm_answer_gss_setup_ctx(struct ssh *, int, struct sshbuf *);
2696 int mm_answer_gss_accept_ctx(struct ssh *, int, struct sshbuf *);
2697 int mm_answer_gss_userok(struct ssh *, int, struct sshbuf *);
2698 int mm_answer_gss_checkmic(struct ssh *, int, struct sshbuf *);
2699+int mm_answer_gss_sign(struct ssh *, int, struct sshbuf *);
2700+int mm_answer_gss_updatecreds(struct ssh *, int, struct sshbuf *);
2701 #endif
2702
2703 #ifdef SSH_AUDIT_EVENTS
2704@@ -219,11 +221,18 @@ struct mon_table mon_dispatch_proto20[] = {
2705 {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
2706 {MONITOR_REQ_GSSUSEROK, MON_ONCE|MON_AUTHDECIDE, mm_answer_gss_userok},
2707 {MONITOR_REQ_GSSCHECKMIC, MON_ONCE, mm_answer_gss_checkmic},
2708+ {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign},
2709 #endif
2710 {0, 0, NULL}
2711 };
2712
2713 struct mon_table mon_dispatch_postauth20[] = {
2714+#ifdef GSSAPI
2715+ {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx},
2716+ {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx},
2717+ {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign},
2718+ {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds},
2719+#endif
2720 #ifdef WITH_OPENSSL
2721 {MONITOR_REQ_MODULI, 0, mm_answer_moduli},
2722 #endif
2723@@ -292,6 +301,10 @@ monitor_child_preauth(struct ssh *ssh, struct monitor *pmonitor)
2724 /* Permit requests for moduli and signatures */
2725 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
2726 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
2727+#ifdef GSSAPI
2728+ /* and for the GSSAPI key exchange */
2729+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
2730+#endif
2731
2732 /* The first few requests do not require asynchronous access */
2733 while (!authenticated) {
2734@@ -405,6 +418,10 @@ monitor_child_postauth(struct ssh *ssh, struct monitor *pmonitor)
2735 monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1);
2736 monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1);
2737 monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1);
2738+#ifdef GSSAPI
2739+ /* and for the GSSAPI key exchange */
2740+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1);
2741+#endif
2742
2743 if (auth_opts->permit_pty_flag) {
2744 monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1);
2745@@ -1687,6 +1704,17 @@ monitor_apply_keystate(struct ssh *ssh, struct monitor *pmonitor)
2746 # ifdef OPENSSL_HAS_ECC
2747 kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
2748 # endif
2749+# ifdef GSSAPI
2750+ if (options.gss_keyex) {
2751+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
2752+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
2753+ kex->kex[KEX_GSS_GRP14_SHA256] = kexgss_server;
2754+ kex->kex[KEX_GSS_GRP16_SHA512] = kexgss_server;
2755+ kex->kex[KEX_GSS_GEX_SHA1] = kexgssgex_server;
2756+ kex->kex[KEX_GSS_NISTP256_SHA256] = kexgss_server;
2757+ kex->kex[KEX_GSS_C25519_SHA256] = kexgss_server;
2758+ }
2759+# endif
2760 #endif /* WITH_OPENSSL */
2761 kex->kex[KEX_C25519_SHA256] = kex_gen_server;
2762 kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
2763@@ -1780,8 +1808,8 @@ mm_answer_gss_setup_ctx(struct ssh *ssh, int sock, struct sshbuf *m)
2764 u_char *p;
2765 int r;
2766
2767- if (!options.gss_authentication)
2768- fatal("%s: GSSAPI authentication not enabled", __func__);
2769+ if (!options.gss_authentication && !options.gss_keyex)
2770+ fatal("%s: GSSAPI not enabled", __func__);
2771
2772 if ((r = sshbuf_get_string(m, &p, &len)) != 0)
2773 fatal("%s: buffer error: %s", __func__, ssh_err(r));
2774@@ -1813,8 +1841,8 @@ mm_answer_gss_accept_ctx(struct ssh *ssh, int sock, struct sshbuf *m)
2775 OM_uint32 flags = 0; /* GSI needs this */
2776 int r;
2777
2778- if (!options.gss_authentication)
2779- fatal("%s: GSSAPI authentication not enabled", __func__);
2780+ if (!options.gss_authentication && !options.gss_keyex)
2781+ fatal("%s: GSSAPI not enabled", __func__);
2782
2783 if ((r = ssh_gssapi_get_buffer_desc(m, &in)) != 0)
2784 fatal("%s: buffer error: %s", __func__, ssh_err(r));
2785@@ -1834,6 +1862,7 @@ mm_answer_gss_accept_ctx(struct ssh *ssh, int sock, struct sshbuf *m)
2786 monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
2787 monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
2788 monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
2789+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1);
2790 }
2791 return (0);
2792 }
2793@@ -1845,8 +1874,8 @@ mm_answer_gss_checkmic(struct ssh *ssh, int sock, struct sshbuf *m)
2794 OM_uint32 ret;
2795 int r;
2796
2797- if (!options.gss_authentication)
2798- fatal("%s: GSSAPI authentication not enabled", __func__);
2799+ if (!options.gss_authentication && !options.gss_keyex)
2800+ fatal("%s: GSSAPI not enabled", __func__);
2801
2802 if ((r = ssh_gssapi_get_buffer_desc(m, &gssbuf)) != 0 ||
2803 (r = ssh_gssapi_get_buffer_desc(m, &mic)) != 0)
2804@@ -1872,13 +1901,17 @@ mm_answer_gss_checkmic(struct ssh *ssh, int sock, struct sshbuf *m)
2805 int
2806 mm_answer_gss_userok(struct ssh *ssh, int sock, struct sshbuf *m)
2807 {
2808- int r, authenticated;
2809+ int r, authenticated, kex;
2810 const char *displayname;
2811
2812- if (!options.gss_authentication)
2813- fatal("%s: GSSAPI authentication not enabled", __func__);
2814+ if (!options.gss_authentication && !options.gss_keyex)
2815+ fatal("%s: GSSAPI not enabled", __func__);
2816
2817- authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user);
2818+ if ((r = sshbuf_get_u32(m, &kex)) != 0)
2819+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2820+
2821+ authenticated = authctxt->valid &&
2822+ ssh_gssapi_userok(authctxt->user, authctxt->pw, kex);
2823
2824 sshbuf_reset(m);
2825 if ((r = sshbuf_put_u32(m, authenticated)) != 0)
2826@@ -1887,7 +1920,11 @@ mm_answer_gss_userok(struct ssh *ssh, int sock, struct sshbuf *m)
2827 debug3("%s: sending result %d", __func__, authenticated);
2828 mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m);
2829
2830- auth_method = "gssapi-with-mic";
2831+ if (kex) {
2832+ auth_method = "gssapi-keyex";
2833+ } else {
2834+ auth_method = "gssapi-with-mic";
2835+ }
2836
2837 if ((displayname = ssh_gssapi_displayname()) != NULL)
2838 auth2_record_info(authctxt, "%s", displayname);
2839@@ -1895,5 +1932,85 @@ mm_answer_gss_userok(struct ssh *ssh, int sock, struct sshbuf *m)
2840 /* Monitor loop will terminate if authenticated */
2841 return (authenticated);
2842 }
2843+
2844+int
2845+mm_answer_gss_sign(struct ssh *ssh, int socket, struct sshbuf *m)
2846+{
2847+ gss_buffer_desc data;
2848+ gss_buffer_desc hash = GSS_C_EMPTY_BUFFER;
2849+ OM_uint32 major, minor;
2850+ size_t len;
2851+ u_char *p = NULL;
2852+ int r;
2853+
2854+ if (!options.gss_authentication && !options.gss_keyex)
2855+ fatal("%s: GSSAPI not enabled", __func__);
2856+
2857+ if ((r = sshbuf_get_string(m, &p, &len)) != 0)
2858+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2859+ data.value = p;
2860+ data.length = len;
2861+ /* Lengths of SHA-1, SHA-256 and SHA-512 hashes that are used */
2862+ if (data.length != 20 && data.length != 32 && data.length != 64)
2863+ fatal("%s: data length incorrect: %d", __func__,
2864+ (int) data.length);
2865+
2866+ /* Save the session ID on the first time around */
2867+ if (session_id2_len == 0) {
2868+ session_id2_len = data.length;
2869+ session_id2 = xmalloc(session_id2_len);
2870+ memcpy(session_id2, data.value, session_id2_len);
2871+ }
2872+ major = ssh_gssapi_sign(gsscontext, &data, &hash);
2873+
2874+ free(data.value);
2875+
2876+ sshbuf_reset(m);
2877+
2878+ if ((r = sshbuf_put_u32(m, major)) != 0 ||
2879+ (r = sshbuf_put_string(m, hash.value, hash.length)) != 0)
2880+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2881+
2882+ mm_request_send(socket, MONITOR_ANS_GSSSIGN, m);
2883+
2884+ gss_release_buffer(&minor, &hash);
2885+
2886+ /* Turn on getpwnam permissions */
2887+ monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1);
2888+
2889+ /* And credential updating, for when rekeying */
2890+ monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1);
2891+
2892+ return (0);
2893+}
2894+
2895+int
2896+mm_answer_gss_updatecreds(struct ssh *ssh, int socket, struct sshbuf *m) {
2897+ ssh_gssapi_ccache store;
2898+ int r, ok;
2899+
2900+ if (!options.gss_authentication && !options.gss_keyex)
2901+ fatal("%s: GSSAPI not enabled", __func__);
2902+
2903+ if ((r = sshbuf_get_string(m, (u_char **)&store.filename, NULL)) != 0 ||
2904+ (r = sshbuf_get_string(m, (u_char **)&store.envvar, NULL)) != 0 ||
2905+ (r = sshbuf_get_string(m, (u_char **)&store.envval, NULL)) != 0)
2906+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2907+
2908+ ok = ssh_gssapi_update_creds(&store);
2909+
2910+ free(store.filename);
2911+ free(store.envvar);
2912+ free(store.envval);
2913+
2914+ sshbuf_reset(m);
2915+ if ((r = sshbuf_put_u32(m, ok)) != 0)
2916+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2917+
2918+ mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m);
2919+
2920+ return(0);
2921+}
2922+
2923 #endif /* GSSAPI */
2924
2925diff --git a/monitor.h b/monitor.h
2926index 683e5e071..2b1a2d590 100644
2927--- a/monitor.h
2928+++ b/monitor.h
2929@@ -63,6 +63,8 @@ enum monitor_reqtype {
2930 MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111,
2931 MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113,
2932
2933+ MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
2934+ MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
2935 };
2936
2937 struct ssh;
2938diff --git a/monitor_wrap.c b/monitor_wrap.c
2939index 4169b7604..fdca39a6a 100644
2940--- a/monitor_wrap.c
2941+++ b/monitor_wrap.c
2942@@ -978,13 +978,15 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic)
2943 }
2944
2945 int
2946-mm_ssh_gssapi_userok(char *user)
2947+mm_ssh_gssapi_userok(char *user, struct passwd *pw, int kex)
2948 {
2949 struct sshbuf *m;
2950 int r, authenticated = 0;
2951
2952 if ((m = sshbuf_new()) == NULL)
2953 fatal("%s: sshbuf_new failed", __func__);
2954+ if ((r = sshbuf_put_u32(m, kex)) != 0)
2955+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2956
2957 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUSEROK, m);
2958 mm_request_receive_expect(pmonitor->m_recvfd,
2959@@ -997,4 +999,57 @@ mm_ssh_gssapi_userok(char *user)
2960 debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not ");
2961 return (authenticated);
2962 }
2963+
2964+OM_uint32
2965+mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash)
2966+{
2967+ struct sshbuf *m;
2968+ OM_uint32 major;
2969+ int r;
2970+
2971+ if ((m = sshbuf_new()) == NULL)
2972+ fatal("%s: sshbuf_new failed", __func__);
2973+ if ((r = sshbuf_put_string(m, data->value, data->length)) != 0)
2974+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2975+
2976+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, m);
2977+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, m);
2978+
2979+ if ((r = sshbuf_get_u32(m, &major)) != 0 ||
2980+ (r = ssh_gssapi_get_buffer_desc(m, hash)) != 0)
2981+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
2982+
2983+ sshbuf_free(m);
2984+
2985+ return (major);
2986+}
2987+
2988+int
2989+mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store)
2990+{
2991+ struct sshbuf *m;
2992+ int r, ok;
2993+
2994+ if ((m = sshbuf_new()) == NULL)
2995+ fatal("%s: sshbuf_new failed", __func__);
2996+
2997+ if ((r = sshbuf_put_cstring(m,
2998+ store->filename ? store->filename : "")) != 0 ||
2999+ (r = sshbuf_put_cstring(m,
3000+ store->envvar ? store->envvar : "")) != 0 ||
3001+ (r = sshbuf_put_cstring(m,
3002+ store->envval ? store->envval : "")) != 0)
3003+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
3004+
3005+ mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, m);
3006+ mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, m);
3007+
3008+ if ((r = sshbuf_get_u32(m, &ok)) != 0)
3009+ fatal("%s: buffer error: %s", __func__, ssh_err(r));
3010+
3011+ sshbuf_free(m);
3012+
3013+ return (ok);
3014+}
3015+
3016 #endif /* GSSAPI */
3017diff --git a/monitor_wrap.h b/monitor_wrap.h
3018index 191277f3a..92dda574b 100644
3019--- a/monitor_wrap.h
3020+++ b/monitor_wrap.h
3021@@ -63,8 +63,10 @@ int mm_sshkey_verify(const struct sshkey *, const u_char *, size_t,
3022 OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
3023 OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *,
3024 gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
3025-int mm_ssh_gssapi_userok(char *user);
3026+int mm_ssh_gssapi_userok(char *user, struct passwd *, int kex);
3027 OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
3028+OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
3029+int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *);
3030 #endif
3031
3032 #ifdef USE_PAM
3033diff --git a/readconf.c b/readconf.c
3034index f78b4d6fe..3c68d1a88 100644
3035--- a/readconf.c
3036+++ b/readconf.c
3037@@ -67,6 +67,7 @@
3038 #include "uidswap.h"
3039 #include "myproposal.h"
3040 #include "digest.h"
3041+#include "ssh-gss.h"
3042
3043 /* Format of the configuration file:
3044
3045@@ -162,6 +163,8 @@ typedef enum {
3046 oClearAllForwardings, oNoHostAuthenticationForLocalhost,
3047 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
3048 oAddressFamily, oGssAuthentication, oGssDelegateCreds,
3049+ oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey,
3050+ oGssServerIdentity, oGssKexAlgorithms,
3051 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
3052 oSendEnv, oSetEnv, oControlPath, oControlMaster, oControlPersist,
3053 oHashKnownHosts,
3054@@ -202,10 +205,22 @@ static struct {
3055 /* Sometimes-unsupported options */
3056 #if defined(GSSAPI)
3057 { "gssapiauthentication", oGssAuthentication },
3058+ { "gssapikeyexchange", oGssKeyEx },
3059 { "gssapidelegatecredentials", oGssDelegateCreds },
3060+ { "gssapitrustdns", oGssTrustDns },
3061+ { "gssapiclientidentity", oGssClientIdentity },
3062+ { "gssapiserveridentity", oGssServerIdentity },
3063+ { "gssapirenewalforcesrekey", oGssRenewalRekey },
3064+ { "gssapikexalgorithms", oGssKexAlgorithms },
3065 # else
3066 { "gssapiauthentication", oUnsupported },
3067+ { "gssapikeyexchange", oUnsupported },
3068 { "gssapidelegatecredentials", oUnsupported },
3069+ { "gssapitrustdns", oUnsupported },
3070+ { "gssapiclientidentity", oUnsupported },
3071+ { "gssapiserveridentity", oUnsupported },
3072+ { "gssapirenewalforcesrekey", oUnsupported },
3073+ { "gssapikexalgorithms", oUnsupported },
3074 #endif
3075 #ifdef ENABLE_PKCS11
3076 { "pkcs11provider", oPKCS11Provider },
3077@@ -988,10 +1003,42 @@ parse_time:
3078 intptr = &options->gss_authentication;
3079 goto parse_flag;
3080
3081+ case oGssKeyEx:
3082+ intptr = &options->gss_keyex;
3083+ goto parse_flag;
3084+
3085 case oGssDelegateCreds:
3086 intptr = &options->gss_deleg_creds;
3087 goto parse_flag;
3088
3089+ case oGssTrustDns:
3090+ intptr = &options->gss_trust_dns;
3091+ goto parse_flag;
3092+
3093+ case oGssClientIdentity:
3094+ charptr = &options->gss_client_identity;
3095+ goto parse_string;
3096+
3097+ case oGssServerIdentity:
3098+ charptr = &options->gss_server_identity;
3099+ goto parse_string;
3100+
3101+ case oGssRenewalRekey:
3102+ intptr = &options->gss_renewal_rekey;
3103+ goto parse_flag;
3104+
3105+ case oGssKexAlgorithms:
3106+ arg = strdelim(&s);
3107+ if (!arg || *arg == '\0')
3108+ fatal("%.200s line %d: Missing argument.",
3109+ filename, linenum);
3110+ if (!kex_gss_names_valid(arg))
3111+ fatal("%.200s line %d: Bad GSSAPI KexAlgorithms '%s'.",
3112+ filename, linenum, arg ? arg : "<NONE>");
3113+ if (*activep && options->gss_kex_algorithms == NULL)
3114+ options->gss_kex_algorithms = xstrdup(arg);
3115+ break;
3116+
3117 case oBatchMode:
3118 intptr = &options->batch_mode;
3119 goto parse_flag;
3120@@ -1863,7 +1910,13 @@ initialize_options(Options * options)
3121 options->pubkey_authentication = -1;
3122 options->challenge_response_authentication = -1;
3123 options->gss_authentication = -1;
3124+ options->gss_keyex = -1;
3125 options->gss_deleg_creds = -1;
3126+ options->gss_trust_dns = -1;
3127+ options->gss_renewal_rekey = -1;
3128+ options->gss_client_identity = NULL;
3129+ options->gss_server_identity = NULL;
3130+ options->gss_kex_algorithms = NULL;
3131 options->password_authentication = -1;
3132 options->kbd_interactive_authentication = -1;
3133 options->kbd_interactive_devices = NULL;
3134@@ -2009,8 +2062,18 @@ fill_default_options(Options * options)
3135 options->challenge_response_authentication = 1;
3136 if (options->gss_authentication == -1)
3137 options->gss_authentication = 0;
3138+ if (options->gss_keyex == -1)
3139+ options->gss_keyex = 0;
3140 if (options->gss_deleg_creds == -1)
3141 options->gss_deleg_creds = 0;
3142+ if (options->gss_trust_dns == -1)
3143+ options->gss_trust_dns = 0;
3144+ if (options->gss_renewal_rekey == -1)
3145+ options->gss_renewal_rekey = 0;
3146+#ifdef GSSAPI
3147+ if (options->gss_kex_algorithms == NULL)
3148+ options->gss_kex_algorithms = strdup(GSS_KEX_DEFAULT_KEX);
3149+#endif
3150 if (options->password_authentication == -1)
3151 options->password_authentication = 1;
3152 if (options->kbd_interactive_authentication == -1)
3153@@ -2625,7 +2688,14 @@ dump_client_config(Options *o, const char *host)
3154 dump_cfg_fmtint(oGatewayPorts, o->fwd_opts.gateway_ports);
3155 #ifdef GSSAPI
3156 dump_cfg_fmtint(oGssAuthentication, o->gss_authentication);
3157+ dump_cfg_fmtint(oGssKeyEx, o->gss_keyex);
3158 dump_cfg_fmtint(oGssDelegateCreds, o->gss_deleg_creds);
3159+ dump_cfg_fmtint(oGssTrustDns, o->gss_trust_dns);
3160+ dump_cfg_fmtint(oGssRenewalRekey, o->gss_renewal_rekey);
3161+ dump_cfg_string(oGssClientIdentity, o->gss_client_identity);
3162+ dump_cfg_string(oGssServerIdentity, o->gss_server_identity);
3163+ dump_cfg_string(oGssKexAlgorithms, o->gss_kex_algorithms ?
3164+ o->gss_kex_algorithms : GSS_KEX_DEFAULT_KEX);
3165 #endif /* GSSAPI */
3166 dump_cfg_fmtint(oHashKnownHosts, o->hash_known_hosts);
3167 dump_cfg_fmtint(oHostbasedAuthentication, o->hostbased_authentication);
3168diff --git a/readconf.h b/readconf.h
3169index 8e36bf32a..0bff6d80a 100644
3170--- a/readconf.h
3171+++ b/readconf.h
3172@@ -40,7 +40,13 @@ typedef struct {
3173 int challenge_response_authentication;
3174 /* Try S/Key or TIS, authentication. */
3175 int gss_authentication; /* Try GSS authentication */
3176+ int gss_keyex; /* Try GSS key exchange */
3177 int gss_deleg_creds; /* Delegate GSS credentials */
3178+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */
3179+ int gss_renewal_rekey; /* Credential renewal forces rekey */
3180+ char *gss_client_identity; /* Principal to initiate GSSAPI with */
3181+ char *gss_server_identity; /* GSSAPI target principal */
3182+ char *gss_kex_algorithms; /* GSSAPI kex methods to be offered by client. */
3183 int password_authentication; /* Try password
3184 * authentication. */
3185 int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
3186diff --git a/servconf.c b/servconf.c
3187index e76f9c39e..f63eb0b94 100644
3188--- a/servconf.c
3189+++ b/servconf.c
3190@@ -64,6 +64,7 @@
3191 #include "auth.h"
3192 #include "myproposal.h"
3193 #include "digest.h"
3194+#include "ssh-gss.h"
3195
3196 static void add_listen_addr(ServerOptions *, const char *,
3197 const char *, int);
3198@@ -124,8 +125,11 @@ initialize_server_options(ServerOptions *options)
3199 options->kerberos_ticket_cleanup = -1;
3200 options->kerberos_get_afs_token = -1;
3201 options->gss_authentication=-1;
3202+ options->gss_keyex = -1;
3203 options->gss_cleanup_creds = -1;
3204 options->gss_strict_acceptor = -1;
3205+ options->gss_store_rekey = -1;
3206+ options->gss_kex_algorithms = NULL;
3207 options->password_authentication = -1;
3208 options->kbd_interactive_authentication = -1;
3209 options->challenge_response_authentication = -1;
3210@@ -351,10 +355,18 @@ fill_default_server_options(ServerOptions *options)
3211 options->kerberos_get_afs_token = 0;
3212 if (options->gss_authentication == -1)
3213 options->gss_authentication = 0;
3214+ if (options->gss_keyex == -1)
3215+ options->gss_keyex = 0;
3216 if (options->gss_cleanup_creds == -1)
3217 options->gss_cleanup_creds = 1;
3218 if (options->gss_strict_acceptor == -1)
3219 options->gss_strict_acceptor = 1;
3220+ if (options->gss_store_rekey == -1)
3221+ options->gss_store_rekey = 0;
3222+#ifdef GSSAPI
3223+ if (options->gss_kex_algorithms == NULL)
3224+ options->gss_kex_algorithms = strdup(GSS_KEX_DEFAULT_KEX);
3225+#endif
3226 if (options->password_authentication == -1)
3227 options->password_authentication = 1;
3228 if (options->kbd_interactive_authentication == -1)
3229@@ -498,6 +510,7 @@ typedef enum {
3230 sHostKeyAlgorithms,
3231 sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile,
3232 sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor,
3233+ sGssKeyEx, sGssKexAlgorithms, sGssStoreRekey,
3234 sAcceptEnv, sSetEnv, sPermitTunnel,
3235 sMatch, sPermitOpen, sPermitListen, sForceCommand, sChrootDirectory,
3236 sUsePrivilegeSeparation, sAllowAgentForwarding,
3237@@ -572,12 +585,22 @@ static struct {
3238 #ifdef GSSAPI
3239 { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL },
3240 { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL },
3241+ { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL },
3242 { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL },
3243+ { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL },
3244+ { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL },
3245+ { "gssapikexalgorithms", sGssKexAlgorithms, SSHCFG_GLOBAL },
3246 #else
3247 { "gssapiauthentication", sUnsupported, SSHCFG_ALL },
3248 { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL },
3249+ { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL },
3250 { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL },
3251+ { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL },
3252+ { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL },
3253+ { "gssapikexalgorithms", sUnsupported, SSHCFG_GLOBAL },
3254 #endif
3255+ { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL },
3256+ { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL },
3257 { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL },
3258 { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL },
3259 { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL },
3260@@ -1488,6 +1511,10 @@ process_server_config_line(ServerOptions *options, char *line,
3261 intptr = &options->gss_authentication;
3262 goto parse_flag;
3263
3264+ case sGssKeyEx:
3265+ intptr = &options->gss_keyex;
3266+ goto parse_flag;
3267+
3268 case sGssCleanupCreds:
3269 intptr = &options->gss_cleanup_creds;
3270 goto parse_flag;
3271@@ -1496,6 +1523,22 @@ process_server_config_line(ServerOptions *options, char *line,
3272 intptr = &options->gss_strict_acceptor;
3273 goto parse_flag;
3274
3275+ case sGssStoreRekey:
3276+ intptr = &options->gss_store_rekey;
3277+ goto parse_flag;
3278+
3279+ case sGssKexAlgorithms:
3280+ arg = strdelim(&cp);
3281+ if (!arg || *arg == '\0')
3282+ fatal("%.200s line %d: Missing argument.",
3283+ filename, linenum);
3284+ if (!kex_gss_names_valid(arg))
3285+ fatal("%.200s line %d: Bad GSSAPI KexAlgorithms '%s'.",
3286+ filename, linenum, arg ? arg : "<NONE>");
3287+ if (*activep && options->gss_kex_algorithms == NULL)
3288+ options->gss_kex_algorithms = xstrdup(arg);
3289+ break;
3290+
3291 case sPasswordAuthentication:
3292 intptr = &options->password_authentication;
3293 goto parse_flag;
3294@@ -2585,6 +2628,10 @@ dump_config(ServerOptions *o)
3295 #ifdef GSSAPI
3296 dump_cfg_fmtint(sGssAuthentication, o->gss_authentication);
3297 dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds);
3298+ dump_cfg_fmtint(sGssKeyEx, o->gss_keyex);
3299+ dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor);
3300+ dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey);
3301+ dump_cfg_string(sGssKexAlgorithms, o->gss_kex_algorithms);
3302 #endif
3303 dump_cfg_fmtint(sPasswordAuthentication, o->password_authentication);
3304 dump_cfg_fmtint(sKbdInteractiveAuthentication,
3305diff --git a/servconf.h b/servconf.h
3306index 5483da051..29329ba1f 100644
3307--- a/servconf.h
3308+++ b/servconf.h
3309@@ -126,8 +126,11 @@ typedef struct {
3310 int kerberos_get_afs_token; /* If true, try to get AFS token if
3311 * authenticated with Kerberos. */
3312 int gss_authentication; /* If true, permit GSSAPI authentication */
3313+ int gss_keyex; /* If true, permit GSSAPI key exchange */
3314 int gss_cleanup_creds; /* If true, destroy cred cache on logout */
3315 int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
3316+ int gss_store_rekey;
3317+ char *gss_kex_algorithms; /* GSSAPI kex methods to be offered by client. */
3318 int password_authentication; /* If true, permit password
3319 * authentication. */
3320 int kbd_interactive_authentication; /* If true, permit */
3321diff --git a/session.c b/session.c
3322index 8f5d7e0a4..f1a47f766 100644
3323--- a/session.c
3324+++ b/session.c
3325@@ -2674,13 +2674,19 @@ do_cleanup(struct ssh *ssh, Authctxt *authctxt)
3326
3327 #ifdef KRB5
3328 if (options.kerberos_ticket_cleanup &&
3329- authctxt->krb5_ctx)
3330+ authctxt->krb5_ctx) {
3331+ temporarily_use_uid(authctxt->pw);
3332 krb5_cleanup_proc(authctxt);
3333+ restore_uid();
3334+ }
3335 #endif
3336
3337 #ifdef GSSAPI
3338- if (options.gss_cleanup_creds)
3339+ if (options.gss_cleanup_creds) {
3340+ temporarily_use_uid(authctxt->pw);
3341 ssh_gssapi_cleanup_creds();
3342+ restore_uid();
3343+ }
3344 #endif
3345
3346 /* remove agent socket */
3347diff --git a/ssh-gss.h b/ssh-gss.h
3348index 36180d07a..70dd36658 100644
3349--- a/ssh-gss.h
3350+++ b/ssh-gss.h
3351@@ -1,6 +1,6 @@
3352 /* $OpenBSD: ssh-gss.h,v 1.14 2018/07/10 09:13:30 djm Exp $ */
3353 /*
3354- * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
3355+ * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved.
3356 *
3357 * Redistribution and use in source and binary forms, with or without
3358 * modification, are permitted provided that the following conditions
3359@@ -61,10 +61,30 @@
3360
3361 #define SSH_GSS_OIDTYPE 0x06
3362
3363+#define SSH2_MSG_KEXGSS_INIT 30
3364+#define SSH2_MSG_KEXGSS_CONTINUE 31
3365+#define SSH2_MSG_KEXGSS_COMPLETE 32
3366+#define SSH2_MSG_KEXGSS_HOSTKEY 33
3367+#define SSH2_MSG_KEXGSS_ERROR 34
3368+#define SSH2_MSG_KEXGSS_GROUPREQ 40
3369+#define SSH2_MSG_KEXGSS_GROUP 41
3370+#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-"
3371+#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-"
3372+#define KEX_GSS_GRP14_SHA256_ID "gss-group14-sha256-"
3373+#define KEX_GSS_GRP16_SHA512_ID "gss-group16-sha512-"
3374+#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-"
3375+#define KEX_GSS_NISTP256_SHA256_ID "gss-nistp256-sha256-"
3376+#define KEX_GSS_C25519_SHA256_ID "gss-curve25519-sha256-"
3377+
3378+#define GSS_KEX_DEFAULT_KEX \
3379+ KEX_GSS_GEX_SHA1_ID "," \
3380+ KEX_GSS_GRP14_SHA1_ID
3381+
3382 typedef struct {
3383 char *filename;
3384 char *envvar;
3385 char *envval;
3386+ struct passwd *owner;
3387 void *data;
3388 } ssh_gssapi_ccache;
3389
3390@@ -72,8 +92,11 @@ typedef struct {
3391 gss_buffer_desc displayname;
3392 gss_buffer_desc exportedname;
3393 gss_cred_id_t creds;
3394+ gss_name_t name;
3395 struct ssh_gssapi_mech_struct *mech;
3396 ssh_gssapi_ccache store;
3397+ int used;
3398+ int updated;
3399 } ssh_gssapi_client;
3400
3401 typedef struct ssh_gssapi_mech_struct {
3402@@ -84,6 +107,7 @@ typedef struct ssh_gssapi_mech_struct {
3403 int (*userok) (ssh_gssapi_client *, char *);
3404 int (*localname) (ssh_gssapi_client *, char **);
3405 void (*storecreds) (ssh_gssapi_client *);
3406+ int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *);
3407 } ssh_gssapi_mech;
3408
3409 typedef struct {
3410@@ -94,10 +118,11 @@ typedef struct {
3411 gss_OID oid; /* client */
3412 gss_cred_id_t creds; /* server */
3413 gss_name_t client; /* server */
3414- gss_cred_id_t client_creds; /* server */
3415+ gss_cred_id_t client_creds; /* both */
3416 } Gssctxt;
3417
3418 extern ssh_gssapi_mech *supported_mechs[];
3419+extern Gssctxt *gss_kex_context;
3420
3421 int ssh_gssapi_check_oid(Gssctxt *, void *, size_t);
3422 void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t);
3423@@ -109,6 +134,7 @@ OM_uint32 ssh_gssapi_test_oid_supported(OM_uint32 *, gss_OID, int *);
3424
3425 struct sshbuf;
3426 int ssh_gssapi_get_buffer_desc(struct sshbuf *, gss_buffer_desc *);
3427+int ssh_gssapi_sshpkt_get_buffer_desc(struct ssh *, gss_buffer_desc *);
3428
3429 OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *);
3430 OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int,
3431@@ -123,17 +149,33 @@ void ssh_gssapi_delete_ctx(Gssctxt **);
3432 OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
3433 void ssh_gssapi_buildmic(struct sshbuf *, const char *,
3434 const char *, const char *);
3435-int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
3436+int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *);
3437+OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *);
3438+int ssh_gssapi_credentials_updated(Gssctxt *);
3439
3440 /* In the server */
3441+typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *,
3442+ const char *);
3443+char *ssh_gssapi_client_mechanisms(const char *, const char *, const char *);
3444+char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *,
3445+ const char *, const char *);
3446+gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
3447+int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *,
3448+ const char *);
3449 OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
3450-int ssh_gssapi_userok(char *name);
3451+int ssh_gssapi_userok(char *name, struct passwd *, int kex);
3452 OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
3453 void ssh_gssapi_do_child(char ***, u_int *);
3454 void ssh_gssapi_cleanup_creds(void);
3455 void ssh_gssapi_storecreds(void);
3456 const char *ssh_gssapi_displayname(void);
3457
3458+char *ssh_gssapi_server_mechanisms(void);
3459+int ssh_gssapi_oid_table_ok(void);
3460+
3461+int ssh_gssapi_update_creds(ssh_gssapi_ccache *store);
3462+void ssh_gssapi_rekey_creds(void);
3463+
3464 #endif /* GSSAPI */
3465
3466 #endif /* _SSH_GSS_H */
3467diff --git a/ssh.1 b/ssh.1
3468index 424d6c3e8..26940ad55 100644
3469--- a/ssh.1
3470+++ b/ssh.1
3471@@ -497,7 +497,13 @@ For full details of the options listed below, and their possible values, see
3472 .It GatewayPorts
3473 .It GlobalKnownHostsFile
3474 .It GSSAPIAuthentication
3475+.It GSSAPIKeyExchange
3476+.It GSSAPIClientIdentity
3477 .It GSSAPIDelegateCredentials
3478+.It GSSAPIKexAlgorithms
3479+.It GSSAPIRenewalForcesRekey
3480+.It GSSAPIServerIdentity
3481+.It GSSAPITrustDns
3482 .It HashKnownHosts
3483 .It Host
3484 .It HostbasedAuthentication
3485@@ -573,6 +579,8 @@ flag),
3486 (supported message integrity codes),
3487 .Ar kex
3488 (key exchange algorithms),
3489+.Ar kex-gss
3490+(GSSAPI key exchange algorithms),
3491 .Ar key
3492 (key types),
3493 .Ar key-cert
3494diff --git a/ssh.c b/ssh.c
3495index ee51823cd..2da9f5d0d 100644
3496--- a/ssh.c
3497+++ b/ssh.c
3498@@ -736,6 +736,8 @@ main(int ac, char **av)
3499 cp = mac_alg_list('\n');
3500 else if (strcmp(optarg, "kex") == 0)
3501 cp = kex_alg_list('\n');
3502+ else if (strcmp(optarg, "kex-gss") == 0)
3503+ cp = kex_gss_alg_list('\n');
3504 else if (strcmp(optarg, "key") == 0)
3505 cp = sshkey_alg_list(0, 0, 0, '\n');
3506 else if (strcmp(optarg, "key-cert") == 0)
3507@@ -748,7 +750,7 @@ main(int ac, char **av)
3508 cp = xstrdup("2");
3509 else if (strcmp(optarg, "help") == 0) {
3510 cp = xstrdup(
3511- "cipher\ncipher-auth\nkex\nkey\n"
3512+ "cipher\ncipher-auth\nkex\nkex-gss\nkey\n"
3513 "key-cert\nkey-plain\nmac\n"
3514 "protocol-version\nsig");
3515 }
3516diff --git a/ssh_config b/ssh_config
3517index 5e8ef548b..1ff999b68 100644
3518--- a/ssh_config
3519+++ b/ssh_config
3520@@ -24,6 +24,8 @@
3521 # HostbasedAuthentication no
3522 # GSSAPIAuthentication no
3523 # GSSAPIDelegateCredentials no
3524+# GSSAPIKeyExchange no
3525+# GSSAPITrustDNS no
3526 # BatchMode no
3527 # CheckHostIP yes
3528 # AddressFamily any
3529diff --git a/ssh_config.5 b/ssh_config.5
3530index 02a87892d..f4668673b 100644
3531--- a/ssh_config.5
3532+++ b/ssh_config.5
3533@@ -758,10 +758,67 @@ The default is
3534 Specifies whether user authentication based on GSSAPI is allowed.
3535 The default is
3536 .Cm no .
3537+.It Cm GSSAPIClientIdentity
3538+If set, specifies the GSSAPI client identity that ssh should use when
3539+connecting to the server. The default is unset, which means that the default
3540+identity will be used.
3541 .It Cm GSSAPIDelegateCredentials
3542 Forward (delegate) credentials to the server.
3543 The default is
3544 .Cm no .
3545+.It Cm GSSAPIKeyExchange
3546+Specifies whether key exchange based on GSSAPI may be used. When using
3547+GSSAPI key exchange the server need not have a host key.
3548+The default is
3549+.Dq no .
3550+.It Cm GSSAPIRenewalForcesRekey
3551+If set to
3552+.Dq yes
3553+then renewal of the client's GSSAPI credentials will force the rekeying of the
3554+ssh connection. With a compatible server, this will delegate the renewed
3555+credentials to a session on the server.
3556+.Pp
3557+Checks are made to ensure that credentials are only propagated when the new
3558+credentials match the old ones on the originating client and where the
3559+receiving server still has the old set in its cache.
3560+.Pp
3561+The default is
3562+.Dq no .
3563+.Pp
3564+For this to work
3565+.Cm GSSAPIKeyExchange
3566+needs to be enabled in the server and also used by the client.
3567+.It Cm GSSAPIServerIdentity
3568+If set, specifies the GSSAPI server identity that ssh should expect when
3569+connecting to the server. The default is unset, which means that the
3570+expected GSSAPI server identity will be determined from the target
3571+hostname.
3572+.It Cm GSSAPITrustDns
3573+Set to
3574+.Dq yes
3575+to indicate that the DNS is trusted to securely canonicalize
3576+the name of the host being connected to. If
3577+.Dq no ,
3578+the hostname entered on the
3579+command line will be passed untouched to the GSSAPI library.
3580+The default is
3581+.Dq no .
3582+.It Cm GSSAPIKexAlgorithms
3583+The list of key exchange algorithms that are offered for GSSAPI
3584+key exchange. Possible values are
3585+.Bd -literal -offset 3n
3586+gss-gex-sha1-,
3587+gss-group1-sha1-,
3588+gss-group14-sha1-,
3589+gss-group14-sha256-,
3590+gss-group16-sha512-,
3591+gss-nistp256-sha256-,
3592+gss-curve25519-sha256-
3593+.Ed
3594+.Pp
3595+The default is
3596+.Dq gss-gex-sha1-,gss-group14-sha1- .
3597+This option only applies to protocol version 2 connections using GSSAPI.
3598 .It Cm HashKnownHosts
3599 Indicates that
3600 .Xr ssh 1
3601diff --git a/sshconnect2.c b/sshconnect2.c
3602index 87fa70a40..a4ec75ca1 100644
3603--- a/sshconnect2.c
3604+++ b/sshconnect2.c
3605@@ -78,8 +78,6 @@
3606 #endif
3607
3608 /* import */
3609-extern char *client_version_string;
3610-extern char *server_version_string;
3611 extern Options options;
3612
3613 /*
3614@@ -161,6 +159,11 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)
3615 char *s, *all_key;
3616 int r;
3617
3618+#if defined(GSSAPI) && defined(WITH_OPENSSL)
3619+ char *orig = NULL, *gss = NULL;
3620+ char *gss_host = NULL;
3621+#endif
3622+
3623 xxx_host = host;
3624 xxx_hostaddr = hostaddr;
3625
3626@@ -193,6 +196,35 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)
3627 order_hostkeyalgs(host, hostaddr, port));
3628 }
3629
3630+#if defined(GSSAPI) && defined(WITH_OPENSSL)
3631+ if (options.gss_keyex) {
3632+ /* Add the GSSAPI mechanisms currently supported on this
3633+ * client to the key exchange algorithm proposal */
3634+ orig = myproposal[PROPOSAL_KEX_ALGS];
3635+
3636+ if (options.gss_server_identity)
3637+ gss_host = xstrdup(options.gss_server_identity);
3638+ else if (options.gss_trust_dns)
3639+ gss_host = remote_hostname(ssh);
3640+ else
3641+ gss_host = xstrdup(host);
3642+
3643+ gss = ssh_gssapi_client_mechanisms(gss_host,
3644+ options.gss_client_identity, options.gss_kex_algorithms);
3645+ if (gss) {
3646+ debug("Offering GSSAPI proposal: %s", gss);
3647+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
3648+ "%s,%s", gss, orig);
3649+
3650+ /* If we've got GSSAPI algorithms, then we also support the
3651+ * 'null' hostkey, as a last resort */
3652+ orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS];
3653+ xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS],
3654+ "%s,null", orig);
3655+ }
3656+ }
3657+#endif
3658+
3659 if (options.rekey_limit || options.rekey_interval)
3660 ssh_packet_set_rekey_limits(ssh, options.rekey_limit,
3661 options.rekey_interval);
3662@@ -211,16 +243,46 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)
3663 # ifdef OPENSSL_HAS_ECC
3664 ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client;
3665 # endif
3666+# ifdef GSSAPI
3667+ if (options.gss_keyex) {
3668+ ssh->kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
3669+ ssh->kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client;
3670+ ssh->kex->kex[KEX_GSS_GRP14_SHA256] = kexgss_client;
3671+ ssh->kex->kex[KEX_GSS_GRP16_SHA512] = kexgss_client;
3672+ ssh->kex->kex[KEX_GSS_GEX_SHA1] = kexgssgex_client;
3673+ ssh->kex->kex[KEX_GSS_NISTP256_SHA256] = kexgss_client;
3674+ ssh->kex->kex[KEX_GSS_C25519_SHA256] = kexgss_client;
3675+ }
3676+# endif
3677 #endif
3678 ssh->kex->kex[KEX_C25519_SHA256] = kex_gen_client;
3679 ssh->kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_client;
3680 ssh->kex->verify_host_key=&verify_host_key_callback;
3681
3682+#if defined(GSSAPI) && defined(WITH_OPENSSL)
3683+ if (options.gss_keyex) {
3684+ ssh->kex->gss_deleg_creds = options.gss_deleg_creds;
3685+ ssh->kex->gss_trust_dns = options.gss_trust_dns;
3686+ ssh->kex->gss_client = options.gss_client_identity;
3687+ ssh->kex->gss_host = gss_host;
3688+ }
3689+#endif
3690+
3691 ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &ssh->kex->done);
3692
3693 /* remove ext-info from the KEX proposals for rekeying */
3694 myproposal[PROPOSAL_KEX_ALGS] =
3695 compat_kex_proposal(options.kex_algorithms);
3696+#if defined(GSSAPI) && defined(WITH_OPENSSL)
3697+ /* repair myproposal after it was crumpled by the */
3698+ /* ext-info removal above */
3699+ if (gss) {
3700+ orig = myproposal[PROPOSAL_KEX_ALGS];
3701+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
3702+ "%s,%s", gss, orig);
3703+ free(gss);
3704+ }
3705+#endif
3706 if ((r = kex_prop2buf(ssh->kex->my, myproposal)) != 0)
3707 fatal("kex_prop2buf: %s", ssh_err(r));
3708
3709@@ -317,6 +379,7 @@ static int input_gssapi_response(int type, u_int32_t, struct ssh *);
3710 static int input_gssapi_token(int type, u_int32_t, struct ssh *);
3711 static int input_gssapi_error(int, u_int32_t, struct ssh *);
3712 static int input_gssapi_errtok(int, u_int32_t, struct ssh *);
3713+static int userauth_gsskeyex(struct ssh *);
3714 #endif
3715
3716 void userauth(struct ssh *, char *);
3717@@ -333,6 +396,11 @@ static char *authmethods_get(void);
3718
3719 Authmethod authmethods[] = {
3720 #ifdef GSSAPI
3721+ {"gssapi-keyex",
3722+ userauth_gsskeyex,
3723+ NULL,
3724+ &options.gss_keyex,
3725+ NULL},
3726 {"gssapi-with-mic",
3727 userauth_gssapi,
3728 userauth_gssapi_cleanup,
3729@@ -697,12 +765,25 @@ userauth_gssapi(struct ssh *ssh)
3730 OM_uint32 min;
3731 int r, ok = 0;
3732 gss_OID mech = NULL;
3733+ char *gss_host;
3734+
3735+ if (options.gss_server_identity)
3736+ gss_host = xstrdup(options.gss_server_identity);
3737+ else if (options.gss_trust_dns)
3738+ gss_host = remote_hostname(ssh);
3739+ else
3740+ gss_host = xstrdup(authctxt->host);
3741
3742 /* Try one GSSAPI method at a time, rather than sending them all at
3743 * once. */
3744
3745 if (authctxt->gss_supported_mechs == NULL)
3746- gss_indicate_mechs(&min, &authctxt->gss_supported_mechs);
3747+ if (GSS_ERROR(gss_indicate_mechs(&min,
3748+ &authctxt->gss_supported_mechs))) {
3749+ authctxt->gss_supported_mechs = NULL;
3750+ free(gss_host);
3751+ return 0;
3752+ }
3753
3754 /* Check to see whether the mechanism is usable before we offer it */
3755 while (authctxt->mech_tried < authctxt->gss_supported_mechs->count &&
3756@@ -711,13 +792,15 @@ userauth_gssapi(struct ssh *ssh)
3757 elements[authctxt->mech_tried];
3758 /* My DER encoding requires length<128 */
3759 if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt,
3760- mech, authctxt->host)) {
3761+ mech, gss_host, options.gss_client_identity)) {
3762 ok = 1; /* Mechanism works */
3763 } else {
3764 authctxt->mech_tried++;
3765 }
3766 }
3767
3768+ free(gss_host);
3769+
3770 if (!ok || mech == NULL)
3771 return 0;
3772
3773@@ -957,6 +1040,55 @@ input_gssapi_error(int type, u_int32_t plen, struct ssh *ssh)
3774 free(lang);
3775 return r;
3776 }
3777+
3778+int
3779+userauth_gsskeyex(struct ssh *ssh)
3780+{
3781+ struct sshbuf *b = NULL;
3782+ Authctxt *authctxt = ssh->authctxt;
3783+ gss_buffer_desc gssbuf;
3784+ gss_buffer_desc mic = GSS_C_EMPTY_BUFFER;
3785+ OM_uint32 ms;
3786+ int r;
3787+
3788+ static int attempt = 0;
3789+ if (attempt++ >= 1)
3790+ return (0);
3791+
3792+ if (gss_kex_context == NULL) {
3793+ debug("No valid Key exchange context");
3794+ return (0);
3795+ }
3796+
3797+ if ((b = sshbuf_new()) == NULL)
3798+ fatal("%s: sshbuf_new failed", __func__);
3799+
3800+ ssh_gssapi_buildmic(b, authctxt->server_user, authctxt->service,
3801+ "gssapi-keyex");
3802+
3803+ if ((gssbuf.value = sshbuf_mutable_ptr(b)) == NULL)
3804+ fatal("%s: sshbuf_mutable_ptr failed", __func__);
3805+ gssbuf.length = sshbuf_len(b);
3806+
3807+ if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) {
3808+ sshbuf_free(b);
3809+ return (0);
3810+ }
3811+
3812+ if ((r = sshpkt_start(ssh, SSH2_MSG_USERAUTH_REQUEST)) != 0 ||
3813+ (r = sshpkt_put_cstring(ssh, authctxt->server_user)) != 0 ||
3814+ (r = sshpkt_put_cstring(ssh, authctxt->service)) != 0 ||
3815+ (r = sshpkt_put_cstring(ssh, authctxt->method->name)) != 0 ||
3816+ (r = sshpkt_put_string(ssh, mic.value, mic.length)) != 0 ||
3817+ (r = sshpkt_send(ssh)) != 0)
3818+ fatal("%s: %s", __func__, ssh_err(r));
3819+
3820+ sshbuf_free(b);
3821+ gss_release_buffer(&ms, &mic);
3822+
3823+ return (1);
3824+}
3825+
3826 #endif /* GSSAPI */
3827
3828 static int
3829diff --git a/sshd.c b/sshd.c
3830index 11571c010..3a5c1ea78 100644
3831--- a/sshd.c
3832+++ b/sshd.c
3833@@ -123,6 +123,10 @@
3834 #include "version.h"
3835 #include "ssherr.h"
3836
3837+#ifdef USE_SECURITY_SESSION_API
3838+#include <Security/AuthSession.h>
3839+#endif
3840+
3841 /* Re-exec fds */
3842 #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1)
3843 #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2)
3844@@ -796,8 +800,8 @@ notify_hostkeys(struct ssh *ssh)
3845 }
3846 debug3("%s: sent %u hostkeys", __func__, nkeys);
3847 if (nkeys == 0)
3848- fatal("%s: no hostkeys", __func__);
3849- if ((r = sshpkt_send(ssh)) != 0)
3850+ debug3("%s: no hostkeys", __func__);
3851+ else if ((r = sshpkt_send(ssh)) != 0)
3852 sshpkt_fatal(ssh, r, "%s: send", __func__);
3853 sshbuf_free(buf);
3854 }
3855@@ -1773,7 +1777,8 @@ main(int ac, char **av)
3856 free(fp);
3857 }
3858 accumulate_host_timing_secret(cfg, NULL);
3859- if (!sensitive_data.have_ssh2_key) {
3860+ /* The GSSAPI key exchange can run without a host key */
3861+ if (!sensitive_data.have_ssh2_key && !options.gss_keyex) {
3862 logit("sshd: no hostkeys available -- exiting.");
3863 exit(1);
3864 }
3865@@ -2069,6 +2074,60 @@ main(int ac, char **av)
3866 rdomain == NULL ? "" : "\"");
3867 free(laddr);
3868
3869+#ifdef USE_SECURITY_SESSION_API
3870+ /*
3871+ * Create a new security session for use by the new user login if
3872+ * the current session is the root session or we are not launched
3873+ * by inetd (eg: debugging mode or server mode). We do not
3874+ * necessarily need to create a session if we are launched from
3875+ * inetd because Panther xinetd will create a session for us.
3876+ *
3877+ * The only case where this logic will fail is if there is an
3878+ * inetd running in a non-root session which is not creating
3879+ * new sessions for us. Then all the users will end up in the
3880+ * same session (bad).
3881+ *
3882+ * When the client exits, the session will be destroyed for us
3883+ * automatically.
3884+ *
3885+ * We must create the session before any credentials are stored
3886+ * (including AFS pags, which happens a few lines below).
3887+ */
3888+ {
3889+ OSStatus err = 0;
3890+ SecuritySessionId sid = 0;
3891+ SessionAttributeBits sattrs = 0;
3892+
3893+ err = SessionGetInfo(callerSecuritySession, &sid, &sattrs);
3894+ if (err)
3895+ error("SessionGetInfo() failed with error %.8X",
3896+ (unsigned) err);
3897+ else
3898+ debug("Current Session ID is %.8X / Session Attributes are %.8X",
3899+ (unsigned) sid, (unsigned) sattrs);
3900+
3901+ if (inetd_flag && !(sattrs & sessionIsRoot))
3902+ debug("Running in inetd mode in a non-root session... "
3903+ "assuming inetd created the session for us.");
3904+ else {
3905+ debug("Creating new security session...");
3906+ err = SessionCreate(0, sessionHasTTY | sessionIsRemote);
3907+ if (err)
3908+ error("SessionCreate() failed with error %.8X",
3909+ (unsigned) err);
3910+
3911+ err = SessionGetInfo(callerSecuritySession, &sid,
3912+ &sattrs);
3913+ if (err)
3914+ error("SessionGetInfo() failed with error %.8X",
3915+ (unsigned) err);
3916+ else
3917+ debug("New Session ID is %.8X / Session Attributes are %.8X",
3918+ (unsigned) sid, (unsigned) sattrs);
3919+ }
3920+ }
3921+#endif
3922+
3923 /*
3924 * We don't want to listen forever unless the other side
3925 * successfully authenticates itself. So we set up an alarm which is
3926@@ -2265,6 +2324,48 @@ do_ssh2_kex(struct ssh *ssh)
3927 myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal(
3928 list_hostkey_types());
3929
3930+#if defined(GSSAPI) && defined(WITH_OPENSSL)
3931+ {
3932+ char *orig;
3933+ char *gss = NULL;
3934+ char *newstr = NULL;
3935+ orig = myproposal[PROPOSAL_KEX_ALGS];
3936+
3937+ /*
3938+ * If we don't have a host key, then there's no point advertising
3939+ * the other key exchange algorithms
3940+ */
3941+
3942+ if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
3943+ orig = NULL;
3944+
3945+ if (options.gss_keyex)
3946+ gss = ssh_gssapi_server_mechanisms();
3947+ else
3948+ gss = NULL;
3949+
3950+ if (gss && orig)
3951+ xasprintf(&newstr, "%s,%s", gss, orig);
3952+ else if (gss)
3953+ newstr = gss;
3954+ else if (orig)
3955+ newstr = orig;
3956+
3957+ /*
3958+ * If we've got GSSAPI mechanisms, then we've got the 'null' host
3959+ * key alg, but we can't tell people about it unless its the only
3960+ * host key algorithm we support
3961+ */
3962+ if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0)
3963+ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null";
3964+
3965+ if (newstr)
3966+ myproposal[PROPOSAL_KEX_ALGS] = newstr;
3967+ else
3968+ fatal("No supported key exchange algorithms");
3969+ }
3970+#endif
3971+
3972 /* start key exchange */
3973 if ((r = kex_setup(ssh, myproposal)) != 0)
3974 fatal("kex_setup: %s", ssh_err(r));
3975@@ -2280,7 +2381,18 @@ do_ssh2_kex(struct ssh *ssh)
3976 # ifdef OPENSSL_HAS_ECC
3977 kex->kex[KEX_ECDH_SHA2] = kex_gen_server;
3978 # endif
3979-#endif
3980+# ifdef GSSAPI
3981+ if (options.gss_keyex) {
3982+ kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server;
3983+ kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server;
3984+ kex->kex[KEX_GSS_GRP14_SHA256] = kexgss_server;
3985+ kex->kex[KEX_GSS_GRP16_SHA512] = kexgss_server;
3986+ kex->kex[KEX_GSS_GEX_SHA1] = kexgssgex_server;
3987+ kex->kex[KEX_GSS_NISTP256_SHA256] = kexgss_server;
3988+ kex->kex[KEX_GSS_C25519_SHA256] = kexgss_server;
3989+ }
3990+# endif
3991+#endif /* WITH_OPENSSL */
3992 kex->kex[KEX_C25519_SHA256] = kex_gen_server;
3993 kex->kex[KEX_KEM_SNTRUP4591761X25519_SHA512] = kex_gen_server;
3994 kex->load_host_public_key=&get_hostkey_public_by_type;
3995diff --git a/sshd_config b/sshd_config
3996index 19b7c91a1..2c48105f8 100644
3997--- a/sshd_config
3998+++ b/sshd_config
3999@@ -69,6 +69,8 @@ AuthorizedKeysFile .ssh/authorized_keys
4000 # GSSAPI options
4001 #GSSAPIAuthentication no
4002 #GSSAPICleanupCredentials yes
4003+#GSSAPIStrictAcceptorCheck yes
4004+#GSSAPIKeyExchange no
4005
4006 # Set this to 'yes' to enable PAM authentication, account processing,
4007 # and session processing. If this is enabled, PAM authentication will
4008diff --git a/sshd_config.5 b/sshd_config.5
4009index 9486f2a1c..cec3c3c4e 100644
4010--- a/sshd_config.5
4011+++ b/sshd_config.5
4012@@ -655,6 +655,11 @@ Specifies whether to automatically destroy the user's credentials cache
4013 on logout.
4014 The default is
4015 .Cm yes .
4016+.It Cm GSSAPIKeyExchange
4017+Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange
4018+doesn't rely on ssh keys to verify host identity.
4019+The default is
4020+.Cm no .
4021 .It Cm GSSAPIStrictAcceptorCheck
4022 Determines whether to be strict about the identity of the GSSAPI acceptor
4023 a client authenticates against.
4024@@ -669,6 +674,31 @@ machine's default store.
4025 This facility is provided to assist with operation on multi homed machines.
4026 The default is
4027 .Cm yes .
4028+.It Cm GSSAPIStoreCredentialsOnRekey
4029+Controls whether the user's GSSAPI credentials should be updated following a
4030+successful connection rekeying. This option can be used to accepted renewed
4031+or updated credentials from a compatible client. The default is
4032+.Dq no .
4033+.Pp
4034+For this to work
4035+.Cm GSSAPIKeyExchange
4036+needs to be enabled in the server and also used by the client.
4037+.It Cm GSSAPIKexAlgorithms
4038+The list of key exchange algorithms that are accepted by GSSAPI
4039+key exchange. Possible values are
4040+.Bd -literal -offset 3n
4041+gss-gex-sha1-,
4042+gss-group1-sha1-,
4043+gss-group14-sha1-,
4044+gss-group14-sha256-,
4045+gss-group16-sha512-,
4046+gss-nistp256-sha256-,
4047+gss-curve25519-sha256-
4048+.Ed
4049+.Pp
4050+The default is
4051+.Dq gss-gex-sha1-,gss-group14-sha1- .
4052+This option only applies to protocol version 2 connections using GSSAPI.
4053 .It Cm HostbasedAcceptedKeyTypes
4054 Specifies the key types that will be accepted for hostbased authentication
4055 as a list of comma-separated patterns.
4056diff --git a/sshkey.c b/sshkey.c
4057index ef90563b3..4d2048b6a 100644
4058--- a/sshkey.c
4059+++ b/sshkey.c
4060@@ -145,6 +145,7 @@ static const struct keytype keytypes[] = {
4061 # endif /* OPENSSL_HAS_NISTP521 */
4062 # endif /* OPENSSL_HAS_ECC */
4063 #endif /* WITH_OPENSSL */
4064+ { "null", "null", NULL, KEY_NULL, 0, 0, 0 },
4065 { NULL, NULL, NULL, -1, -1, 0, 0 }
4066 };
4067
4068@@ -233,7 +234,7 @@ sshkey_alg_list(int certs_only, int plain_only, int include_sigonly, char sep)
4069 const struct keytype *kt;
4070
4071 for (kt = keytypes; kt->type != -1; kt++) {
4072- if (kt->name == NULL)
4073+ if (kt->name == NULL || kt->type == KEY_NULL)
4074 continue;
4075 if (!include_sigonly && kt->sigonly)
4076 continue;
4077diff --git a/sshkey.h b/sshkey.h
4078index 1119a7b07..1bf30d055 100644
4079--- a/sshkey.h
4080+++ b/sshkey.h
4081@@ -65,6 +65,7 @@ enum sshkey_types {
4082 KEY_ED25519_CERT,
4083 KEY_XMSS,
4084 KEY_XMSS_CERT,
4085+ KEY_NULL,
4086 KEY_UNSPEC
4087 };
4088
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch
new file mode 100644
index 000000000..2f7ac943d
--- /dev/null
+++ b/debian/patches/keepalive-extensions.patch
@@ -0,0 +1,134 @@
1From 26d9fe60e31c78018bdfd49bba1196ea7c44405d 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 a7fb7ca15..09787c0e5 100644
30--- a/readconf.c
31+++ b/readconf.c
32@@ -177,6 +177,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@@ -326,6 +327,8 @@ static struct {
41 { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
42 { "ignoreunknown", oIgnoreUnknown },
43 { "proxyjump", oProxyJump },
44+ { "protocolkeepalives", oProtocolKeepAlives },
45+ { "setuptimeout", oSetupTimeOut },
46
47 { NULL, oBadOption }
48 };
49@@ -1449,6 +1452,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@@ -2142,8 +2147,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 f4668673b..bc04d8d02 100644
76--- a/ssh_config.5
77+++ b/ssh_config.5
78@@ -265,8 +265,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@@ -1557,7 +1561,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@@ -1637,6 +1648,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 cec3c3c4e..eec224158 100644
123--- a/sshd_config.5
124+++ b/sshd_config.5
125@@ -1615,6 +1615,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..639b216d6
--- /dev/null
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -0,0 +1,44 @@
1From fdcf8c0343564121a89be817386c5feabd40c609 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 644057bc4..41e75a275 100644
18--- a/sshconnect.c
19+++ b/sshconnect.c
20@@ -990,9 +990,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@@ -1001,6 +1005,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..9b5baee08
--- /dev/null
+++ b/debian/patches/no-openssl-version-status.patch
@@ -0,0 +1,62 @@
1From ed88eee326ca80e1e0fdb6f9ef0346f6d5e021a8 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 a37ca61bf..c1749210d 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..46e1f8712
--- /dev/null
+++ b/debian/patches/openbsd-docs.patch
@@ -0,0 +1,148 @@
1From 8fb8f70b0534897791c61f2757e97bd13385944e 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 957d2f0f0..143a2349f 100644
48--- a/ssh-keygen.1
49+++ b/ssh-keygen.1
50@@ -191,9 +191,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@@ -256,9 +254,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@@ -798,7 +794,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@@ -1049,7 +1045,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 20e4c4efa..4923031f4 100644
92--- a/ssh.1
93+++ b/ssh.1
94@@ -873,6 +873,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 46537f177..270805060 100644
137--- a/sshd_config.5
138+++ b/sshd_config.5
139@@ -393,8 +393,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..7a811f9af
--- /dev/null
+++ b/debian/patches/package-versioning.patch
@@ -0,0 +1,47 @@
1From 6a8dfab1a067a52b004594fadb3a90578a8cc094 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: 2019-06-05
13
14Patch-Name: package-versioning.patch
15---
16 kex.c | 2 +-
17 version.h | 7 ++++++-
18 2 files changed, 7 insertions(+), 2 deletions(-)
19
20diff --git a/kex.c b/kex.c
21index e09355dbd..65ed6af02 100644
22--- a/kex.c
23+++ b/kex.c
24@@ -1239,7 +1239,7 @@ kex_exchange_identification(struct ssh *ssh, int timeout_ms,
25 if (version_addendum != NULL && *version_addendum == '\0')
26 version_addendum = NULL;
27 if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%.100s%s%s\r\n",
28- PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION,
29+ PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE,
30 version_addendum == NULL ? "" : " ",
31 version_addendum == NULL ? "" : version_addendum)) != 0) {
32 error("%s: sshbuf_putf: %s", __func__, ssh_err(r));
33diff --git a/version.h b/version.h
34index 6b3fadf89..a24017eca 100644
35--- a/version.h
36+++ b/version.h
37@@ -3,4 +3,9 @@
38 #define SSH_VERSION "OpenSSH_8.1"
39
40 #define SSH_PORTABLE "p1"
41-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE
42+#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE
43+#ifdef SSH_EXTRAVERSION
44+#define SSH_RELEASE SSH_RELEASE_MINIMUM " " SSH_EXTRAVERSION
45+#else
46+#define SSH_RELEASE SSH_RELEASE_MINIMUM
47+#endif
diff --git a/debian/patches/regress-2020.patch b/debian/patches/regress-2020.patch
new file mode 100644
index 000000000..b46e0df31
--- /dev/null
+++ b/debian/patches/regress-2020.patch
@@ -0,0 +1,44 @@
1From df3ad29af495185aa9b051028ae94b965a4b1659 Mon Sep 17 00:00:00 2001
2From: "djm@openbsd.org" <djm@openbsd.org>
3Date: Fri, 3 Jan 2020 03:02:26 +0000
4Subject: upstream: what bozo decided to use 2020 as a future date in a regress
5
6test?
7
8OpenBSD-Regress-ID: 3b953df5a7e14081ff6cf495d4e8d40e153cbc3a
9
10Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=ff31f15773ee173502eec4d7861ec56f26bba381
11Last-Update: 2020-01-09
12
13Patch-Name: regress-2020.patch
14---
15 regress/cert-hostkey.sh | 2 +-
16 regress/cert-userkey.sh | 2 +-
17 2 files changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/regress/cert-hostkey.sh b/regress/cert-hostkey.sh
20index 86ea62504..844adabcc 100644
21--- a/regress/cert-hostkey.sh
22+++ b/regress/cert-hostkey.sh
23@@ -252,7 +252,7 @@ test_one() {
24 test_one "user-certificate" failure "-n $HOSTS"
25 test_one "empty principals" success "-h"
26 test_one "wrong principals" failure "-h -n foo"
27-test_one "cert not yet valid" failure "-h -V20200101:20300101"
28+test_one "cert not yet valid" failure "-h -V20300101:20320101"
29 test_one "cert expired" failure "-h -V19800101:19900101"
30 test_one "cert valid interval" success "-h -V-1w:+2w"
31 test_one "cert has constraints" failure "-h -Oforce-command=false"
32diff --git a/regress/cert-userkey.sh b/regress/cert-userkey.sh
33index 38c14a698..5cd02fc3f 100644
34--- a/regress/cert-userkey.sh
35+++ b/regress/cert-userkey.sh
36@@ -338,7 +338,7 @@ test_one() {
37 test_one "correct principal" success "-n ${USER}"
38 test_one "host-certificate" failure "-n ${USER} -h"
39 test_one "wrong principals" failure "-n foo"
40-test_one "cert not yet valid" failure "-n ${USER} -V20200101:20300101"
41+test_one "cert not yet valid" failure "-n ${USER} -V20300101:20320101"
42 test_one "cert expired" failure "-n ${USER} -V19800101:19900101"
43 test_one "cert valid interval" success "-n ${USER} -V-1w:+2w"
44 test_one "wrong source-address" failure "-n ${USER} -Osource-address=10.0.0.0/8"
diff --git a/debian/patches/restore-authorized_keys2.patch b/debian/patches/restore-authorized_keys2.patch
new file mode 100644
index 000000000..ea5ea0396
--- /dev/null
+++ b/debian/patches/restore-authorized_keys2.patch
@@ -0,0 +1,35 @@
1From f0c916d8008c30809fef44469bee1b74426a3071 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..222a996f1
--- /dev/null
+++ b/debian/patches/restore-tcp-wrappers.patch
@@ -0,0 +1,172 @@
1From 57c1dd662f9259f58a47801e2d4b0f84e973441d 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: 2019-06-05
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 1c2512314..e894db9fc 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -1521,6 +1521,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@@ -5242,6 +5298,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 3a5c1ea78..4e32fd10d 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@@ -2062,6 +2069,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 (ssh_packet_connection_is_on_socket(ssh)) {
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/revert-ipqos-defaults.patch b/debian/patches/revert-ipqos-defaults.patch
new file mode 100644
index 000000000..7fdfe246c
--- /dev/null
+++ b/debian/patches/revert-ipqos-defaults.patch
@@ -0,0 +1,93 @@
1From cfa01c635debb10e05f5ac34d269809c77c582dc Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org>
3Date: Mon, 8 Apr 2019 10:46:29 +0100
4Subject: Revert "upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP
5 AF21 for"
6
7This reverts commit 5ee8448ad7c306f05a9f56769f95336a8269f379.
8
9The IPQoS default changes have some unfortunate interactions with
10iptables (see https://bugs.debian.org/923880) and VMware, so I'm
11temporarily reverting them until those have been fixed.
12
13Bug-Debian: https://bugs.debian.org/923879
14Bug-Debian: https://bugs.debian.org/926229
15Bug-Ubuntu: https://bugs.launchpad.net/bugs/1822370
16Last-Update: 2019-04-08
17
18Patch-Name: revert-ipqos-defaults.patch
19---
20 readconf.c | 4 ++--
21 servconf.c | 4 ++--
22 ssh_config.5 | 6 ++----
23 sshd_config.5 | 6 ++----
24 4 files changed, 8 insertions(+), 12 deletions(-)
25
26diff --git a/readconf.c b/readconf.c
27index 253574ce0..9812b8d98 100644
28--- a/readconf.c
29+++ b/readconf.c
30@@ -2174,9 +2174,9 @@ fill_default_options(Options * options)
31 if (options->visual_host_key == -1)
32 options->visual_host_key = 0;
33 if (options->ip_qos_interactive == -1)
34- options->ip_qos_interactive = IPTOS_DSCP_AF21;
35+ options->ip_qos_interactive = IPTOS_LOWDELAY;
36 if (options->ip_qos_bulk == -1)
37- options->ip_qos_bulk = IPTOS_DSCP_CS1;
38+ options->ip_qos_bulk = IPTOS_THROUGHPUT;
39 if (options->request_tty == -1)
40 options->request_tty = REQUEST_TTY_AUTO;
41 if (options->proxy_use_fdpass == -1)
42diff --git a/servconf.c b/servconf.c
43index 5576098a5..4464d51a5 100644
44--- a/servconf.c
45+++ b/servconf.c
46@@ -423,9 +423,9 @@ fill_default_server_options(ServerOptions *options)
47 if (options->permit_tun == -1)
48 options->permit_tun = SSH_TUNMODE_NO;
49 if (options->ip_qos_interactive == -1)
50- options->ip_qos_interactive = IPTOS_DSCP_AF21;
51+ options->ip_qos_interactive = IPTOS_LOWDELAY;
52 if (options->ip_qos_bulk == -1)
53- options->ip_qos_bulk = IPTOS_DSCP_CS1;
54+ options->ip_qos_bulk = IPTOS_THROUGHPUT;
55 if (options->version_addendum == NULL)
56 options->version_addendum = xstrdup("");
57 if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1)
58diff --git a/ssh_config.5 b/ssh_config.5
59index d27655e15..b71d5ede9 100644
60--- a/ssh_config.5
61+++ b/ssh_config.5
62@@ -1110,11 +1110,9 @@ If one argument is specified, it is used as the packet class unconditionally.
63 If two values are specified, the first is automatically selected for
64 interactive sessions and the second for non-interactive sessions.
65 The default is
66-.Cm af21
67-(Low-Latency Data)
68+.Cm lowdelay
69 for interactive sessions and
70-.Cm cs1
71-(Lower Effort)
72+.Cm throughput
73 for non-interactive sessions.
74 .It Cm KbdInteractiveAuthentication
75 Specifies whether to use keyboard-interactive authentication.
76diff --git a/sshd_config.5 b/sshd_config.5
77index 02e29cb6f..ba533af9e 100644
78--- a/sshd_config.5
79+++ b/sshd_config.5
80@@ -892,11 +892,9 @@ If one argument is specified, it is used as the packet class unconditionally.
81 If two values are specified, the first is automatically selected for
82 interactive sessions and the second for non-interactive sessions.
83 The default is
84-.Cm af21
85-(Low-Latency Data)
86+.Cm lowdelay
87 for interactive sessions and
88-.Cm cs1
89-(Lower Effort)
90+.Cm throughput
91 for non-interactive sessions.
92 .It Cm KbdInteractiveAuthentication
93 Specifies whether to allow keyboard-interactive authentication.
diff --git a/debian/patches/sandbox-seccomp-clock_gettime64.patch b/debian/patches/sandbox-seccomp-clock_gettime64.patch
new file mode 100644
index 000000000..ad0d647a2
--- /dev/null
+++ b/debian/patches/sandbox-seccomp-clock_gettime64.patch
@@ -0,0 +1,30 @@
1From 93e9440bae1818746e0cc7f2543001db9d0ea1ea Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 7 Jan 2020 16:26:45 -0800
4Subject: seccomp: Allow clock_gettime64() in sandbox.
5
6This helps sshd accept connections on mips platforms with
7upcoming glibc ( 2.31 )
8
9Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=b110cefdfbf5a20f49b774a55062d6ded2fb6e22
10Last-Update: 2020-01-11
11
12Patch-Name: sandbox-seccomp-clock_gettime64.patch
13---
14 sandbox-seccomp-filter.c | 3 +++
15 1 file changed, 3 insertions(+)
16
17diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
18index 3ef30c9d5..999c46c9f 100644
19--- a/sandbox-seccomp-filter.c
20+++ b/sandbox-seccomp-filter.c
21@@ -248,6 +248,9 @@ static const struct sock_filter preauth_insns[] = {
22 #ifdef __NR_clock_nanosleep_time64
23 SC_ALLOW(__NR_clock_nanosleep_time64),
24 #endif
25+#ifdef __NR_clock_gettime64
26+ SC_ALLOW(__NR_clock_gettime64),
27+#endif
28 #ifdef __NR__newselect
29 SC_ALLOW(__NR__newselect),
30 #endif
diff --git a/debian/patches/sandbox-seccomp-clock_nanosleep.patch b/debian/patches/sandbox-seccomp-clock_nanosleep.patch
new file mode 100644
index 000000000..ccf9d0b09
--- /dev/null
+++ b/debian/patches/sandbox-seccomp-clock_nanosleep.patch
@@ -0,0 +1,31 @@
1From c80d266f4aed7224261b192b8e31ac87dc070cba Mon Sep 17 00:00:00 2001
2From: Darren Tucker <dtucker@dtucker.net>
3Date: Wed, 13 Nov 2019 23:19:35 +1100
4Subject: seccomp: Allow clock_nanosleep() in sandbox.
5
6seccomp: Allow clock_nanosleep() to make OpenSSH working with latest
7glibc. Patch from Jakub Jelen <jjelen@redhat.com> via bz #3093.
8
9Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=b1c82f4b8adf3f42476d8a1f292df33fb7aa1a56
10Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=546274a6f89489d2e6be8a8b62f2bb63c87a61fd
11Last-Update: 2020-01-11
12
13Patch-Name: sandbox-seccomp-clock_nanosleep.patch
14---
15 sandbox-seccomp-filter.c | 3 +++
16 1 file changed, 3 insertions(+)
17
18diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
19index b5cda70bb..be2397671 100644
20--- a/sandbox-seccomp-filter.c
21+++ b/sandbox-seccomp-filter.c
22@@ -242,6 +242,9 @@ static const struct sock_filter preauth_insns[] = {
23 #ifdef __NR_nanosleep
24 SC_ALLOW(__NR_nanosleep),
25 #endif
26+#ifdef __NR_clock_nanosleep
27+ SC_ALLOW(__NR_clock_nanosleep),
28+#endif
29 #ifdef __NR__newselect
30 SC_ALLOW(__NR__newselect),
31 #endif
diff --git a/debian/patches/sandbox-seccomp-clock_nanosleep_time64.patch b/debian/patches/sandbox-seccomp-clock_nanosleep_time64.patch
new file mode 100644
index 000000000..8825d569d
--- /dev/null
+++ b/debian/patches/sandbox-seccomp-clock_nanosleep_time64.patch
@@ -0,0 +1,29 @@
1From c80c5e338c19964755f277b54b390016f5c829a4 Mon Sep 17 00:00:00 2001
2From: Darren Tucker <dtucker@dtucker.net>
3Date: Mon, 16 Dec 2019 13:55:56 +1100
4Subject: Allow clock_nanosleep_time64 in seccomp sandbox.
5
6Needed on Linux ARM. bz#3100, patch from jjelen@redhat.com.
7
8Origin: upstream, https://anongit.mindrot.org/openssh.git/commit/?id=5af6fd5461bb709304e6979c8b7856c7af921c9e
9Last-Update: 2020-01-11
10
11Patch-Name: sandbox-seccomp-clock_nanosleep_time64.patch
12---
13 sandbox-seccomp-filter.c | 3 +++
14 1 file changed, 3 insertions(+)
15
16diff --git a/sandbox-seccomp-filter.c b/sandbox-seccomp-filter.c
17index be2397671..3ef30c9d5 100644
18--- a/sandbox-seccomp-filter.c
19+++ b/sandbox-seccomp-filter.c
20@@ -245,6 +245,9 @@ static const struct sock_filter preauth_insns[] = {
21 #ifdef __NR_clock_nanosleep
22 SC_ALLOW(__NR_clock_nanosleep),
23 #endif
24+#ifdef __NR_clock_nanosleep_time64
25+ SC_ALLOW(__NR_clock_nanosleep_time64),
26+#endif
27 #ifdef __NR__newselect
28 SC_ALLOW(__NR__newselect),
29 #endif
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch
new file mode 100644
index 000000000..e69c9c46e
--- /dev/null
+++ b/debian/patches/scp-quoting.patch
@@ -0,0 +1,41 @@
1From 2d8e679834c81fc381d02974986e08cafe3efa29 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 0348d0673..5a7a92a7e 100644
21--- a/scp.c
22+++ b/scp.c
23@@ -199,8 +199,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/selinux-role.patch b/debian/patches/selinux-role.patch
new file mode 100644
index 000000000..02d740fe3
--- /dev/null
+++ b/debian/patches/selinux-role.patch
@@ -0,0 +1,472 @@
1From 3131e3bb3c56a6c6ee8cb9d68f542af04cd9e8ff 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: 2019-06-05
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 becc672b5..5da9fe75f 100644
35--- a/auth.h
36+++ b/auth.h
37@@ -63,6 +63,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 1c217268c..92a6bcaf4 100644
47--- a/auth2.c
48+++ b/auth2.c
49@@ -265,7 +265,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 = NULL, *service = NULL, *method = NULL, *style = NULL;
54+ char *user = NULL, *service = NULL, *method = NULL, *style = NULL, *role = NULL;
55 int r, authenticated = 0;
56 double tstart = monotime_double();
57
58@@ -279,8 +279,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@@ -307,8 +312,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(ssh);
81 if (auth2_setup_methods_lists(authctxt) != 0)
82 ssh_packet_disconnect(ssh,
83diff --git a/monitor.c b/monitor.c
84index bead9e204..04db44c9c 100644
85--- a/monitor.c
86+++ b/monitor.c
87@@ -117,6 +117,7 @@ int mm_answer_sign(struct ssh *, int, struct sshbuf *);
88 int mm_answer_pwnamallow(struct ssh *, int, struct sshbuf *);
89 int mm_answer_auth2_read_banner(struct ssh *, int, struct sshbuf *);
90 int mm_answer_authserv(struct ssh *, int, struct sshbuf *);
91+int mm_answer_authrole(struct ssh *, int, struct sshbuf *);
92 int mm_answer_authpassword(struct ssh *, int, struct sshbuf *);
93 int mm_answer_bsdauthquery(struct ssh *, int, struct sshbuf *);
94 int mm_answer_bsdauthrespond(struct ssh *, int, struct sshbuf *);
95@@ -197,6 +198,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@@ -819,6 +821,7 @@ mm_answer_pwnamallow(struct ssh *ssh, 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@@ -852,16 +855,42 @@ mm_answer_authserv(struct ssh *ssh, 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(struct ssh *ssh, 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@@ -1528,7 +1557,7 @@ mm_answer_pty(struct ssh *ssh, 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 2b1a2d590..4d87284aa 100644
168--- a/monitor.h
169+++ b/monitor.h
170@@ -65,6 +65,8 @@ enum monitor_reqtype {
171
172 MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151,
173 MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153,
174+
175+ MONITOR_REQ_AUTHROLE = 154,
176 };
177
178 struct ssh;
179diff --git a/monitor_wrap.c b/monitor_wrap.c
180index fdca39a6a..933ce9a3d 100644
181--- a/monitor_wrap.c
182+++ b/monitor_wrap.c
183@@ -364,10 +364,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@@ -377,7 +377,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@@ -385,6 +386,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 92dda574b..0f09dba09 100644
235--- a/monitor_wrap.h
236+++ b/monitor_wrap.h
237@@ -46,7 +46,8 @@ DH *mm_choose_dh(int, int, int);
238 #endif
239 int mm_sshkey_sign(struct ssh *, struct sshkey *, u_char **, size_t *,
240 const u_char *, size_t, 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(struct ssh *, 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 44ba71dc5..2defe9425 100644
332--- a/platform.c
333+++ b/platform.c
334@@ -143,7 +143,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@@ -184,7 +184,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 f1a47f766..df7d7cf55 100644
367--- a/session.c
368+++ b/session.c
369@@ -1356,7 +1356,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@@ -1384,7 +1384,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@@ -1525,7 +1525,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@@ -1543,7 +1543,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@@ -1942,7 +1942,7 @@ session_pty_req(struct ssh *ssh, Session *s)
406 sshpkt_fatal(ssh, r, "%s: parse packet", __func__);
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 4e32fd10d..ea8beacb4 100644
429--- a/sshd.c
430+++ b/sshd.c
431@@ -594,7 +594,7 @@ privsep_postauth(struct ssh *ssh, 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 bce09e255..308449b37 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@@ -186,7 +186,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..8dbd1355a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,29 @@
1gssapi.patch
2restore-tcp-wrappers.patch
3selinux-role.patch
4ssh-vulnkey-compat.patch
5keepalive-extensions.patch
6syslog-level-silent.patch
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
24conch-old-privkey-format.patch
25revert-ipqos-defaults.patch
26regress-2020.patch
27sandbox-seccomp-clock_nanosleep.patch
28sandbox-seccomp-clock_nanosleep_time64.patch
29sandbox-seccomp-clock_gettime64.patch
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch
new file mode 100644
index 000000000..d7f69011e
--- /dev/null
+++ b/debian/patches/shell-path.patch
@@ -0,0 +1,39 @@
1From 5d1aab0eb6baeb044516660a0bde36cba2a3f9c2 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 6230dad32..644057bc4 100644
20--- a/sshconnect.c
21+++ b/sshconnect.c
22@@ -260,7 +260,7 @@ ssh_proxy_connect(struct ssh *ssh, const char *host, const char *host_arg,
23 /* Execute the proxy command. Note that we gave up any
24 extra privileges above. */
25 signal(SIGPIPE, SIG_DFL);
26- execv(argv[0], argv);
27+ execvp(argv[0], argv);
28 perror(argv[0]);
29 exit(1);
30 }
31@@ -1387,7 +1387,7 @@ ssh_local_cmd(const char *args)
32 if (pid == 0) {
33 signal(SIGPIPE, SIG_DFL);
34 debug3("Executing %s -c \"%s\"", shell, args);
35- execl(shell, shell, "-c", args, (char *)NULL);
36+ execlp(shell, shell, "-c", args, (char *)NULL);
37 error("Couldn't execute %s -c \"%s\": %s",
38 shell, args, strerror(errno));
39 _exit(1);
diff --git a/debian/patches/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch
new file mode 100644
index 000000000..0dd4c662e
--- /dev/null
+++ b/debian/patches/ssh-agent-setgid.patch
@@ -0,0 +1,40 @@
1From a8b5ec5c28805f0ab6b1b05474531521ac42eb12 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..af95ce67e
--- /dev/null
+++ b/debian/patches/ssh-argv0.patch
@@ -0,0 +1,31 @@
1From e9f961ffa4e4e73ed22103b5697147d135d88b4f 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 4923031f4..24530e511 100644
22--- a/ssh.1
23+++ b/ssh.1
24@@ -1584,6 +1584,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..5c2b58257
--- /dev/null
+++ b/debian/patches/ssh-vulnkey-compat.patch
@@ -0,0 +1,42 @@
1From 42c820f76fddf2f2e537dbe10842aa39f6154059 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 3c68d1a88..a7fb7ca15 100644
21--- a/readconf.c
22+++ b/readconf.c
23@@ -192,6 +192,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 f63eb0b94..73b93c636 100644
33--- a/servconf.c
34+++ b/servconf.c
35@@ -621,6 +621,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..2e4e5bbec
--- /dev/null
+++ b/debian/patches/syslog-level-silent.patch
@@ -0,0 +1,47 @@
1From 3d1a993f484e9043e57af3ae37b7c9c608d5a5f1 Mon Sep 17 00:00:00 2001
2From: Natalie Amery <nmamery@chiark.greenend.org.uk>
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 2da9f5d0d..7b482dcb0 100644
37--- a/ssh.c
38+++ b/ssh.c
39@@ -1268,7 +1268,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..7fb76cf3d
--- /dev/null
+++ b/debian/patches/systemd-readiness.patch
@@ -0,0 +1,84 @@
1From ab765b2bd55062a704f09da8f8c1c4ad1d6630a7 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 e894db9fc..c119d6fd1 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -4499,6 +4499,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@@ -5305,6 +5328,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 4e8ff0662..5e7679a33 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@@ -1951,6 +1955,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..9a1b434fa
--- /dev/null
+++ b/debian/patches/user-group-modes.patch
@@ -0,0 +1,210 @@
1From 19f1d075a06f4d3c9b440d7272272569d8bb0a17 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: 2019-10-09
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 7a10210b6..587f53721 100644
31--- a/auth-rhosts.c
32+++ b/auth-rhosts.c
33@@ -260,8 +260,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@@ -287,8 +286,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 47c27773c..fc0c05bae 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 88833d7ff..42eeb425a 100644
69--- a/misc.c
70+++ b/misc.c
71@@ -59,8 +59,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@@ -1112,6 +1113,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@@ -1869,8 +1919,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@@ -1885,8 +1934,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) == -1 ||
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 bcc34f980..869895d3a 100644
160--- a/misc.h
161+++ b/misc.h
162@@ -181,6 +181,8 @@ int opt_match(const char **opts, const char *term);
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 09787c0e5..16d2729dd 100644
173--- a/readconf.c
174+++ b/readconf.c
175@@ -1855,8 +1855,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 26940ad55..20e4c4efa 100644
187--- a/ssh.1
188+++ b/ssh.1
189@@ -1484,6 +1484,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 bc04d8d02..2c74b57c0 100644
200--- a/ssh_config.5
201+++ b/ssh_config.5
202@@ -1907,6 +1907,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 writable 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..5e415fc7f
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,228 @@
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# Everything above here is common to the deb and udeb builds.
69confflags_udeb := $(confflags)
70
71# Options specific to the deb build.
72confflags += --with-tcp-wrappers
73confflags += --with-pam
74confflags += --with-libedit
75confflags += --with-kerberos5=/usr
76confflags += --with-ssl-engine
77ifeq ($(DEB_HOST_ARCH_OS),linux)
78confflags += --with-selinux
79confflags += --with-audit=linux
80confflags += --with-systemd
81endif
82
83# The deb build wants xauth; the udeb build doesn't.
84confflags += --with-xauth=/usr/bin/xauth
85confflags_udeb += --without-xauth
86
87# Default paths. The udeb build has /usr/games removed.
88confflags += --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH)
89confflags_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
90
91# Compiler flags.
92cflags := $(CPPFLAGS) $(CFLAGS)
93cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
94cflags_udeb := -Os
95cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\"
96confflags += --with-cflags='$(cflags)'
97confflags_udeb += --with-cflags='$(cflags_udeb)'
98
99# Linker flags.
100confflags += --with-ldflags='$(strip -Wl,--as-needed $(LDFLAGS))'
101confflags_udeb += --with-ldflags='-Wl,--as-needed'
102
103ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386)
104 BUILD_PACKAGES += -Nopenssh-tests
105endif
106
107%:
108 dh $@ --with=autoreconf,systemd,runit $(BUILD_PACKAGES)
109
110autoreconf:
111 autoreconf -f -i
112 cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
113
114override_dh_autoreconf-arch:
115 dh_autoreconf debian/rules -- autoreconf
116
117override_dh_autoreconf-indep:
118
119override_dh_auto_configure-arch:
120 dh_auto_configure -Bdebian/build-deb -- $(confflags)
121ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
122 dh_auto_configure -Bdebian/build-udeb -- $(confflags_udeb)
123 # Avoid libnsl linkage. Ugh.
124 perl -pi -e 's/ +-lnsl//' debian/build-udeb/config.status
125 cd debian/build-udeb && ./config.status
126endif
127
128override_dh_auto_configure-indep:
129
130override_dh_auto_build-arch:
131 $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
132 $(MAKE) -C debian/build-deb regress-prep
133 $(MAKE) -C debian/build-deb $(PARALLEL) regress-binaries
134ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
135 $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
136endif
137
138ifeq ($(filter pkg.openssh.nognome,$(DEB_BUILD_PROFILES)),)
139 $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
140endif
141
142override_dh_auto_build-indep:
143
144override_dh_auto_test-arch:
145ifeq ($(RUN_TESTS),yes)
146 $(MAKE) -C debian/build-deb unit compat-tests
147 $(MAKE) -C debian/keygen-test
148endif
149
150override_dh_auto_test-indep:
151
152override_dh_auto_clean:
153 rm -rf debian/build-deb debian/build-udeb
154ifeq ($(RUN_TESTS),yes)
155 $(MAKE) -C debian/keygen-test clean
156endif
157 $(MAKE) -C contrib clean
158
159override_dh_auto_install-arch:
160 $(MAKE) -C debian/build-deb DESTDIR=`pwd`/debian/tmp install-nokeys
161
162override_dh_auto_install-indep:
163
164override_dh_install-arch:
165 rm -f debian/tmp/etc/ssh/sshd_config
166
167 dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing
168ifeq ($(filter noudeb,$(DEB_BUILD_PROFILES)),)
169 dh_install -popenssh-client-udeb -popenssh-server-udeb \
170 --sourcedir=debian/build-udeb
171endif
172
173 # Remove version control tags to avoid unnecessary conffile
174 # resolution steps for administrators.
175 sed -i '/\$$OpenBSD:/d' \
176 debian/openssh-server/etc/ssh/moduli \
177 debian/openssh-client/etc/ssh/ssh_config
178
179# We'd like to use dh_install --fail-missing here, but that doesn't work
180# well in combination with dh-exec: it complains that files generated by
181# dh-exec for architecture-dependent packages aren't installed.
182override_dh_install-indep:
183 rm -f debian/tmp/etc/ssh/sshd_config
184 dh_install
185
186override_dh_installdocs:
187 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server
188 dh_installdocs -popenssh-server -popenssh-sftp-server \
189 --link-doc=openssh-client
190 # Avoid breaking dh_installexamples later.
191 mkdir -p debian/openssh-server/usr/share/doc/openssh-client
192
193override_dh_systemd_enable:
194 dh_systemd_enable -popenssh-server --name ssh ssh.service
195 dh_systemd_enable -popenssh-server --name ssh --no-enable ssh.socket
196
197override_dh_installinit:
198 dh_installinit -R --name ssh
199
200debian/openssh-server.sshd.pam: debian/openssh-server.sshd.pam.in
201ifeq ($(DEB_HOST_ARCH_OS),linux)
202 sed 's/^@IF_KEYINIT@//' $< > $@
203else
204 sed '/^@IF_KEYINIT@/d' $< > $@
205endif
206
207override_dh_installpam: debian/openssh-server.sshd.pam
208 dh_installpam --name sshd
209
210override_dh_runit:
211 dh_runit -popenssh-server
212
213override_dh_fixperms-arch:
214 dh_fixperms
215 chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign
216
217# Tighten libssl dependencies to match the check in entropy.c.
218override_dh_shlibdeps:
219 dh_shlibdeps
220 debian/adjust-openssl-dependencies
221
222override_dh_gencontrol:
223 dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)'
224
225debian/faq.html:
226 wget -O - http://www.openssh.com/faq.html | \
227 sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.com/\2,g' \
228 > debian/faq.html
diff --git a/debian/run-tests b/debian/run-tests
new file mode 100755
index 000000000..2b787ef60
--- /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=conch3 \
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..945530c24
--- /dev/null
+++ b/debian/ssh-argv0
@@ -0,0 +1,31 @@
1#! /bin/sh
2set -e
3
4# Copyright (c) 2001 Natalie 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..fec9ff3f7
--- /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.
62Natalie 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..8bc480a74
--- /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 python3-twisted,
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