diff options
Diffstat (limited to 'debian')
98 files changed, 13170 insertions, 0 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm new file mode 100644 index 000000000..5a2f70e06 --- /dev/null +++ b/debian/.git-dpm | |||
@@ -0,0 +1,8 @@ | |||
1 | # see git-dpm(1) from git-dpm package | ||
2 | bdb60d16baf6d163844fc6f5f8520bc853b6611b | ||
3 | bdb60d16baf6d163844fc6f5f8520bc853b6611b | ||
4 | 9a975a9faed7c4f334e8c8490db3e77e102f2b21 | ||
5 | 9a975a9faed7c4f334e8c8490db3e77e102f2b21 | ||
6 | openssh_6.5p1.orig.tar.gz | ||
7 | 3363a72b4fee91b29cf2024ff633c17f6cd2f86d | ||
8 | 1293187 | ||
diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000000000..7a67e1528 --- /dev/null +++ b/debian/NEWS | |||
@@ -0,0 +1,42 @@ | |||
1 | openssh (1:5.4p1-2) unstable; urgency=low | ||
2 | |||
3 | Smartcard support is now available using PKCS#11 tokens. If you were | ||
4 | previously using an unofficial build of Debian's OpenSSH package with | ||
5 | OpenSC-based smartcard support added, then note that commands like | ||
6 | 'ssh-add -s 0' will no longer work; you need to use 'ssh-add -s | ||
7 | /usr/lib/opensc-pkcs11.so' instead. | ||
8 | |||
9 | -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100 | ||
10 | |||
11 | openssh (1:3.8.1p1-9) experimental; urgency=low | ||
12 | |||
13 | The ssh package has been split into openssh-client and openssh-server. If | ||
14 | you had previously requested that the sshd server should not be run, then | ||
15 | that request will still be honoured. However, the recommended approach is | ||
16 | now to remove the openssh-server package if you do not want to run sshd. | ||
17 | You can remove the old /etc/ssh/sshd_not_to_be_run marker file after doing | ||
18 | that. | ||
19 | |||
20 | -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100 | ||
21 | |||
22 | openssh (1:3.5p1-1) unstable; urgency=low | ||
23 | |||
24 | This version of OpenSSH disables the environment option for public keys by | ||
25 | default, in order to avoid certain attacks (for example, LD_PRELOAD). If | ||
26 | you are using this option in an authorized_keys file, beware that the keys | ||
27 | in question will no longer work until the option is removed. | ||
28 | |||
29 | To re-enable this option, set "PermitUserEnvironment yes" in | ||
30 | /etc/ssh/sshd_config after the upgrade is complete, taking note of the | ||
31 | warning in the sshd_config(5) manual page. | ||
32 | |||
33 | -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100 | ||
34 | |||
35 | openssh (1:3.0.1p1-1) unstable; urgency=high | ||
36 | |||
37 | As of version 3, OpenSSH no longer uses separate files for ssh1 and ssh2 | ||
38 | keys. This means the authorized_keys2 and known_hosts2 files are no longer | ||
39 | needed. They will still be read in order to maintain backward | ||
40 | compatibility. | ||
41 | |||
42 | -- Matthew Vernon <matthew@debian.org> Thu, 28 Nov 2001 17:43:01 +0000 | ||
diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000000000..ff15f6d07 --- /dev/null +++ b/debian/README.Debian | |||
@@ -0,0 +1,227 @@ | |||
1 | OpenSSH for Debian | ||
2 | ------------------ | ||
3 | |||
4 | UPGRADE ISSUES | ||
5 | ============== | ||
6 | |||
7 | Privilege Separation | ||
8 | -------------------- | ||
9 | |||
10 | As of 3.3, openssh has employed privilege separation to reduce the | ||
11 | quantity of code that runs as root, thereby reducing the impact of | ||
12 | some security holes in sshd. This now also works properly with PAM. | ||
13 | |||
14 | Privilege separation is turned on by default, so, if you decide you | ||
15 | want it turned off, you need to add "UsePrivilegeSeparation no" to | ||
16 | /etc/ssh/sshd_config. | ||
17 | |||
18 | PermitRootLogin set to yes | ||
19 | -------------------------- | ||
20 | |||
21 | This is now the default setting (in line with upstream), and people | ||
22 | who asked for an automatically-generated configuration file when | ||
23 | upgrading from potato (or on a new install) will have this setting in | ||
24 | their /etc/ssh/sshd_config file. | ||
25 | |||
26 | Should you wish to change this setting, edit /etc/ssh/sshd_config, and | ||
27 | change: | ||
28 | PermitRootLogin yes | ||
29 | to: | ||
30 | PermitRootLogin no | ||
31 | |||
32 | Having PermitRootLogin set to yes means that an attacker that knows | ||
33 | the root password can ssh in directly (without having to go via a user | ||
34 | account). If you set it to no, then they must compromise a normal user | ||
35 | account. In the vast majority of cases, this does not give added | ||
36 | security; remember that any account you su to root from is equivalent | ||
37 | to root - compromising this account gives an attacker access to root | ||
38 | easily. If you only ever log in as root from the physical console, | ||
39 | then you probably want to set this value to no. | ||
40 | |||
41 | As an aside, PermitRootLogin can also be set to "without-password" or | ||
42 | "forced-commands-only" - see sshd(8) for more details. | ||
43 | |||
44 | DO NOT FILE BUG REPORTS SAYING YOU THINK THIS DEFAULT IS INCORRECT! | ||
45 | |||
46 | The argument above is somewhat condensed; I have had this discussion | ||
47 | at great length with many people. If you think the default is | ||
48 | incorrect, and feel strongly enough to want to argue about it, then | ||
49 | send email to debian-ssh@lists.debian.org. I will close bug reports | ||
50 | claiming the default is incorrect. | ||
51 | |||
52 | X11 Forwarding | ||
53 | -------------- | ||
54 | |||
55 | ssh's default for ForwardX11 has been changed to ``no'' because it has | ||
56 | been pointed out that logging into remote systems administered by | ||
57 | untrusted people is likely to open you up to X11 attacks, so you | ||
58 | should have to actively decide that you trust the remote machine's | ||
59 | root, before enabling X11. I strongly recommend that you do this on a | ||
60 | machine-by-machine basis, rather than just enabling it in the default | ||
61 | host settings. | ||
62 | |||
63 | In order for X11 forwarding to work, you need to install xauth on the | ||
64 | server. In Debian this is in the xbase-clients package. | ||
65 | |||
66 | As of OpenSSH 3.1, the remote $DISPLAY uses localhost by default to reduce | ||
67 | the security risks of X11 forwarding. Look up X11UseLocalhost in | ||
68 | sshd_config(8) if this is a problem. | ||
69 | |||
70 | OpenSSH 3.8 invented ForwardX11Trusted, which when set to no causes the | ||
71 | ssh client to create an untrusted X cookie so that attacks on the | ||
72 | forwarded X11 connection can't become attacks on X clients on the remote | ||
73 | machine. However, this has some problems in implementation - notably a | ||
74 | very short timeout of the untrusted cookie - breaks large numbers of | ||
75 | existing setups, and generally seems immature. The Debian package | ||
76 | therefore sets the default for this option to "yes" (in ssh itself, | ||
77 | rather than in ssh_config). | ||
78 | |||
79 | Fallback to RSH | ||
80 | --------------- | ||
81 | |||
82 | The default for this setting has been changed from Yes to No, for | ||
83 | security reasons, and to stop the delay attempting to rsh to machines | ||
84 | that don't offer the service. Simply switch it back on in either | ||
85 | /etc/ssh/ssh_config or ~/.ssh/config for those machines that you need | ||
86 | it for. | ||
87 | |||
88 | Setgid ssh-agent and environment variables | ||
89 | ------------------------------------------ | ||
90 | |||
91 | As of version 1:3.5p1-1, ssh-agent is installed setgid to prevent ptrace() | ||
92 | attacks retrieving private key material. This has the side-effect of causing | ||
93 | glibc to remove certain environment variables which might have security | ||
94 | implications for set-id programs, including LD_PRELOAD, LD_LIBRARY_PATH, and | ||
95 | TMPDIR. | ||
96 | |||
97 | If you need to set any of these environment variables, you will need to do | ||
98 | so in the program exec()ed by ssh-agent. This may involve creating a small | ||
99 | wrapper script. | ||
100 | |||
101 | Symlink Hostname invocation | ||
102 | --------------------------- | ||
103 | |||
104 | This version of ssh no longer includes support for invoking ssh with the | ||
105 | hostname as the name of the file run. People wanting this support should | ||
106 | use the ssh-argv0 script. | ||
107 | |||
108 | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | ||
109 | |||
110 | OTHER ISSUES | ||
111 | ============ | ||
112 | |||
113 | /usr/bin/ssh not SUID | ||
114 | --------------------- | ||
115 | |||
116 | Due to Debian bug #164325, RhostsRSAAuthentication can only be used if ssh | ||
117 | is SUID. Until this is fixed, if that is a problem, use: | ||
118 | |||
119 | dpkg-statoverride | ||
120 | |||
121 | or if that's also missing, use this: | ||
122 | |||
123 | chown root.root /usr/bin/ssh | ||
124 | chmod 04755 /usr/bin/ssh | ||
125 | |||
126 | Authorization Forwarding | ||
127 | ------------------------ | ||
128 | |||
129 | Similarly, root on a remote server could make use of your ssh-agent | ||
130 | (while you're logged into their machine) to obtain access to machines | ||
131 | which trust your keys. This feature is therefore disabled by default. | ||
132 | You should only re-enable it for those hosts (in your ~/.ssh/config or | ||
133 | /etc/ssh/ssh_config) where you are confident that the remote machine | ||
134 | is not a threat. | ||
135 | |||
136 | Problems logging in with RSA authentication | ||
137 | ------------------------------------------- | ||
138 | |||
139 | If you have trouble logging in with RSA authentication then the | ||
140 | problem is probably caused by the fact that you have your home | ||
141 | directory writable by group, as well as user (this is the default on | ||
142 | Debian systems). | ||
143 | |||
144 | Depending upon other settings on your system (i.e. other users being | ||
145 | in your group) this could open a security hole, so you will need to | ||
146 | make your home directory writable only by yourself. Run this command, | ||
147 | as yourself: | ||
148 | |||
149 | chmod g-w ~/ | ||
150 | |||
151 | to remove group write permissions. If you use ssh-copy-id to install your | ||
152 | keys, it does this for you. | ||
153 | |||
154 | -L option of ssh nonfree | ||
155 | ------------------------ | ||
156 | |||
157 | non-free ssh supported the usage of the option -L to use a non privileged | ||
158 | port for scp. This option will not be supported by scp from openssh. | ||
159 | |||
160 | Please use instead scp -o "UsePrivilegedPort=no" as documented in the | ||
161 | manpage to scp itself. | ||
162 | |||
163 | Problem logging in because of TCP-Wrappers | ||
164 | ------------------------------------------ | ||
165 | |||
166 | ssh is compiled with support for tcp-wrappers. So if you can no longer | ||
167 | log into your system, please check that /etc/hosts.allow and /etc/hosts.deny | ||
168 | are configured so that ssh is not blocked. | ||
169 | |||
170 | Kerberos support | ||
171 | ---------------- | ||
172 | |||
173 | ssh is now compiled with Kerberos support. Unfortunately, privilege | ||
174 | separation is incompatible with Kerberos support for SSH protocol 1 and | ||
175 | parts of the support for protocol 2; you may need to run kinit after logging | ||
176 | in. | ||
177 | |||
178 | Interoperability between scp and the ssh.com SSH server | ||
179 | ------------------------------------------------------- | ||
180 | |||
181 | In version 2 and greater of the commercial SSH server produced by SSH | ||
182 | Communications Security, scp was changed to use SFTP (SSH2's file transfer | ||
183 | protocol) instead of the traditional rcp-over-ssh, thereby breaking | ||
184 | compatibility. The OpenSSH developers regard this as a bug in the ssh.com | ||
185 | server, and do not currently intend to change OpenSSH's scp to match. | ||
186 | |||
187 | Workarounds for this problem are to install scp1 on the server (scp2 will | ||
188 | fall back to it), to use sftp, or to use some other transfer mechanism such | ||
189 | as rsync-over-ssh or tar-over-ssh. | ||
190 | |||
191 | Running sshd from inittab | ||
192 | ------------------------- | ||
193 | |||
194 | Some people find it useful to run the sshd server from inittab, to make sure | ||
195 | that it always stays running. To do this, stop sshd ('/etc/init.d/ssh | ||
196 | stop'), add the following line to /etc/inittab, and run 'telinit q': | ||
197 | |||
198 | ss:2345:respawn:/usr/sbin/sshd -D | ||
199 | |||
200 | If you do this, note that you will need to stop sshd being started in the | ||
201 | normal way ('rm -f /etc/rc[2345].d/S16ssh') and that you will need to | ||
202 | restart this sshd manually on upgrades. | ||
203 | |||
204 | Per-connection sshd instances with systemd | ||
205 | ------------------------------------------ | ||
206 | |||
207 | If you want to reconfigure systemd to listen on port 22 itself and launch an | ||
208 | instance of sshd for each connection (inetd-style socket activation), then | ||
209 | you can run: | ||
210 | |||
211 | systemctl stop ssh.service | ||
212 | systemctl start ssh.socket | ||
213 | |||
214 | To make this permanent: | ||
215 | |||
216 | systemctl disable ssh.service | ||
217 | systemctl enable ssh.socket | ||
218 | |||
219 | This may be appropriate in environments where minimal footprint is critical | ||
220 | (e.g. cloud guests). Be aware that this bypasses MaxStartups, and systemd's | ||
221 | MaxConnections cannot quite replace this as it cannot distinguish between | ||
222 | authenticated and unauthenticated connections; see | ||
223 | https://bugzilla.redhat.com/show_bug.cgi?id=963268 for more discussion. | ||
224 | |||
225 | -- | ||
226 | Matthew Vernon <matthew@debian.org> | ||
227 | Colin Watson <cjwatson@debian.org> | ||
diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies new file mode 100755 index 000000000..9daa9b415 --- /dev/null +++ b/debian/adjust-openssl-dependencies | |||
@@ -0,0 +1,32 @@ | |||
1 | #! /bin/sh | ||
2 | # Attempt to tighten libssl dependencies to match the check in entropy.c. | ||
3 | # Must be run after dpkg-shlibdeps. | ||
4 | |||
5 | client=debian/openssh-client.substvars | ||
6 | server=debian/openssh-server.substvars | ||
7 | |||
8 | libssl_version="$(dpkg-query -W libssl-dev 2>/dev/null | cut -f2)" | ||
9 | if [ -z "$libssl_version" ]; then | ||
10 | echo "Can't find libssl-dev version; leaving dependencies alone." | ||
11 | exit 0 | ||
12 | fi | ||
13 | libssl_version="$(echo "$libssl_version" | sed 's/[a-z-].*//')" | ||
14 | |||
15 | libssl_package="$(sed -n 's/.*[= ]\(libssl[0-9][a-z0-9+.-]*\).*/\1/p' "$client")" | ||
16 | if [ "$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" | ||
20 | fi | ||
21 | |||
22 | client_udeb=debian/openssh-client-udeb.substvars | ||
23 | server_udeb=debian/openssh-server-udeb.substvars | ||
24 | |||
25 | libcrypto_package="$(sed -n 's/.*[= ]\(libcrypto[0-9][a-z0-9+.-]*\).*/\1/p' "$client_udeb")" | ||
26 | if [ "$libcrypto_package" ]; then | ||
27 | new_dep="$libcrypto_package (>= $libssl_version)" | ||
28 | sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_udeb" | ||
29 | sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server_udeb" | ||
30 | fi | ||
31 | |||
32 | exit 0 | ||
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..ca43c3762 --- /dev/null +++ b/debian/changelog | |||
@@ -0,0 +1,3616 @@ | |||
1 | openssh (1:6.5p1-3) UNRELEASED; urgency=medium | ||
2 | |||
3 | * Clarify socket activation mode in README.Debian, as suggested by Uoti | ||
4 | Urpala. | ||
5 | * Stop claiming that "Protocol 2" is a Debian-specific default; this has | ||
6 | been upstream's default since 5.4p1. | ||
7 | |||
8 | -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000 | ||
9 | |||
10 | openssh (1:6.5p1-2) unstable; urgency=medium | ||
11 | |||
12 | * Only enable ssh.service for systemd, not both ssh.service and | ||
13 | ssh.socket. Thanks to Michael Biebl for spotting this. | ||
14 | * Backport upstream patch to unbreak case-sensitive matching of ssh_config | ||
15 | (closes: #738619). | ||
16 | |||
17 | -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 11:28:35 +0000 | ||
18 | |||
19 | openssh (1:6.5p1-1) unstable; urgency=medium | ||
20 | |||
21 | * New upstream release (http://www.openssh.com/txt/release-6.5, | ||
22 | LP: #1275068): | ||
23 | - ssh(1): Add support for client-side hostname canonicalisation using a | ||
24 | set of DNS suffixes and rules in ssh_config(5). This allows | ||
25 | unqualified names to be canonicalised to fully-qualified domain names | ||
26 | to eliminate ambiguity when looking up keys in known_hosts or checking | ||
27 | host certificate names (closes: #115286). | ||
28 | * Switch to git; adjust Vcs-* fields. | ||
29 | * Convert to git-dpm, and drop source package documentation associated | ||
30 | with the old bzr/quilt patch handling workflow. | ||
31 | * Drop ssh-vulnkey and the associated ssh/ssh-add/sshd integration code, | ||
32 | leaving only basic configuration file compatibility, since it has been | ||
33 | nearly six years since the original vulnerability and this code is not | ||
34 | likely to be of much value any more (closes: #481853, #570651). See | ||
35 | https://lists.debian.org/debian-devel/2013/09/msg00240.html for my full | ||
36 | reasoning. | ||
37 | * Add OpenPGP signature checking configuration to watch file (thanks, | ||
38 | Daniel Kahn Gillmor; closes: #732441). | ||
39 | * Add the pam_keyinit session module, to create a new session keyring on | ||
40 | login (closes: #734816). | ||
41 | * Incorporate default path changes from shadow 1:4.0.18.1-8, removing | ||
42 | /usr/bin/X11 (closes: #644521). | ||
43 | * Generate ED25519 host keys on fresh installations. Upgraders who wish | ||
44 | to add such host keys should manually add 'HostKey | ||
45 | /etc/ssh/ssh_host_ed25519_key' to /etc/ssh/sshd_config and run | ||
46 | 'ssh-keygen -q -f /etc/ssh/ssh_host_ed25519_key -N "" -t ed25519'. | ||
47 | * Drop long-obsolete "SSH now uses protocol 2 by default" section from | ||
48 | README.Debian. | ||
49 | * Add systemd support (thanks, Sven Joachim; closes: #676830). | ||
50 | |||
51 | -- Colin Watson <cjwatson@debian.org> Mon, 10 Feb 2014 14:58:26 +0000 | ||
52 | |||
53 | openssh (1:6.4p1-2) unstable; urgency=high | ||
54 | |||
55 | * Increase ServerKeyBits value in package-generated sshd_config to 1024 | ||
56 | (closes: #727622, LP: #1244272). | ||
57 | * Restore patch to disable OpenSSL version check (closes: #732940). | ||
58 | |||
59 | -- Colin Watson <cjwatson@debian.org> Mon, 23 Dec 2013 10:44:04 +0000 | ||
60 | |||
61 | openssh (1:6.4p1-1) unstable; urgency=high | ||
62 | |||
63 | * New upstream release. Important changes: | ||
64 | - 6.3/6.3p1 (http://www.openssh.com/txt/release-6.3): | ||
65 | + sftp(1): add support for resuming partial downloads using the | ||
66 | "reget" command and on the sftp commandline or on the "get" | ||
67 | commandline using the "-a" (append) option (closes: #158590). | ||
68 | + ssh(1): add an "IgnoreUnknown" configuration option to selectively | ||
69 | suppress errors arising from unknown configuration directives | ||
70 | (closes: #436052). | ||
71 | + sftp(1): update progressmeter when data is acknowledged, not when | ||
72 | it's sent (partially addresses #708372). | ||
73 | + ssh(1): do not fatally exit when attempting to cleanup multiplexing- | ||
74 | created channels that are incompletely opened (closes: #651357). | ||
75 | - 6.4/6.4p1 (http://www.openssh.com/txt/release-6.4): | ||
76 | + CVE-2013-4548: sshd(8): fix a memory corruption problem triggered | ||
77 | during rekeying when an AES-GCM cipher is selected (closes: | ||
78 | #729029). Full details of the vulnerability are available at: | ||
79 | http://www.openssh.com/txt/gcmrekey.adv | ||
80 | * When running under Upstart, only consider the daemon started once it is | ||
81 | ready to accept connections (by raising SIGSTOP at that point and using | ||
82 | "expect stop"). | ||
83 | |||
84 | -- Colin Watson <cjwatson@debian.org> Sat, 09 Nov 2013 18:24:16 +0000 | ||
85 | |||
86 | openssh (1:6.2p2-6) unstable; urgency=low | ||
87 | |||
88 | * Update config.guess and config.sub automatically at build time. | ||
89 | dh_autoreconf does not take care of that by default because openssh does | ||
90 | not use automake. | ||
91 | |||
92 | -- Colin Watson <cjwatson@debian.org> Tue, 02 Jul 2013 22:54:49 +0100 | ||
93 | |||
94 | openssh (1:6.2p2-5) unstable; urgency=low | ||
95 | |||
96 | [ Colin Watson ] | ||
97 | * Document consequences of ssh-agent being setgid in ssh-agent(1); see | ||
98 | #711623. | ||
99 | * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and | ||
100 | ssh-argv0. | ||
101 | |||
102 | [ Yolanda Robla ] | ||
103 | * debian/rules: Include real distribution in SSH_EXTRAVERSION instead of | ||
104 | hardcoding Debian (LP: #1195342). | ||
105 | |||
106 | -- Colin Watson <cjwatson@debian.org> Thu, 27 Jun 2013 15:24:14 +0100 | ||
107 | |||
108 | openssh (1:6.2p2-4) unstable; urgency=low | ||
109 | |||
110 | * Fix non-portable shell in ssh-copy-id (closes: #711162). | ||
111 | * Rebuild against debhelper 9.20130604 with fixed dependencies for | ||
112 | invoke-rc.d and Upstart jobs (closes: #711159, #711364). | ||
113 | * Set SELinux context on private host keys as well as public host keys | ||
114 | (closes: #687436). | ||
115 | |||
116 | -- Colin Watson <cjwatson@debian.org> Thu, 06 Jun 2013 17:06:31 +0100 | ||
117 | |||
118 | openssh (1:6.2p2-3) unstable; urgency=low | ||
119 | |||
120 | * If the running init daemon is Upstart, then, on the first upgrade to | ||
121 | this version, check whether sysvinit is still managing sshd; if so, | ||
122 | manually stop it so that it can be restarted under upstart. We do this | ||
123 | near the end of the postinst, so it shouldn't result in any appreciable | ||
124 | extra window where sshd is not running during upgrade. | ||
125 | |||
126 | -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 17:42:10 +0100 | ||
127 | |||
128 | openssh (1:6.2p2-2) unstable; urgency=low | ||
129 | |||
130 | * Change start condition of Upstart job to be just the standard "runlevel | ||
131 | [2345]", rather than "filesystem or runlevel [2345]"; the latter makes | ||
132 | it unreasonably difficult to ensure that urandom starts before ssh, and | ||
133 | is not really necessary since one of static-network-up and failsafe-boot | ||
134 | is guaranteed to happen and will trigger entry to the default runlevel, | ||
135 | and we don't care about ssh starting before the network (LP: #1098299). | ||
136 | * Drop conffile handling for direct upgrades from pre-split ssh package; | ||
137 | this was originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a | ||
138 | truly ghastly hack around a misbehaviour in sarge's dpkg. Since this is | ||
139 | now four Debian releases ago, we can afford to drop this and simplify | ||
140 | the packaging. | ||
141 | * Remove ssh/use_old_init_script, which was a workaround for a very old | ||
142 | bug in /etc/init.d/ssh. If anyone has ignored this for >10 years then | ||
143 | they aren't going to be convinced now (closes: #214182). | ||
144 | * Remove support for upgrading directly from ssh-nonfree. | ||
145 | * Remove lots of maintainer script support for direct upgrades from | ||
146 | pre-etch (three releases before current stable). | ||
147 | * Add #DEBHELPER# tokens to openssh-client.postinst and | ||
148 | openssh-server.postinst. | ||
149 | * Replace old manual conffile handling code with dpkg-maintscript-helper, | ||
150 | via dh_installdeb. | ||
151 | * Switch to new unified layout for Upstart jobs as documented in | ||
152 | https://wiki.ubuntu.com/UpstartCompatibleInitScripts: the init script | ||
153 | checks for a running Upstart, and we now let dh_installinit handle most | ||
154 | of the heavy lifting in maintainer scripts. Ubuntu users should be | ||
155 | essentially unaffected except that sshd may no longer start | ||
156 | automatically in chroots if the running Upstart predates 0.9.0; but the | ||
157 | main goal is simply not to break when openssh-server is installed in a | ||
158 | chroot. | ||
159 | * Remove the check for vulnerable host keys; this was first added five | ||
160 | years ago, and everyone should have upgraded through a version that | ||
161 | applied these checks by now. The ssh-vulnkey tool and the blacklisting | ||
162 | support in sshd are still here, at least for the moment. | ||
163 | * This removes the last of our uses of debconf (closes: #221531). | ||
164 | * Use the pam_loginuid session module (thanks, Laurent Bigonville; closes: | ||
165 | #677440, LP: #1067779). | ||
166 | * Bracket our session stack with calls to pam_selinux close/open (thanks, | ||
167 | Laurent Bigonville; closes: #679458). | ||
168 | * Fix dh_builddeb invocation so that we really use xz compression for | ||
169 | binary packages, as intended since 1:6.1p1-2. | ||
170 | |||
171 | -- Colin Watson <cjwatson@debian.org> Wed, 22 May 2013 09:07:42 +0100 | ||
172 | |||
173 | openssh (1:6.2p2-1) unstable; urgency=low | ||
174 | |||
175 | * New upstream release (http://www.openssh.com/txt/release-6.2p2): | ||
176 | - Only warn for missing identity files that were explicitly specified | ||
177 | (closes: #708275). | ||
178 | - Fix bug in contributed contrib/ssh-copy-id script that could result in | ||
179 | "rm *" being called on mktemp failure (closes: #708419). | ||
180 | |||
181 | -- Colin Watson <cjwatson@debian.org> Thu, 16 May 2013 14:05:06 +0100 | ||
182 | |||
183 | openssh (1:6.2p1-3) unstable; urgency=low | ||
184 | |||
185 | * Renumber Debian-specific additions to enum monitor_reqtype so that they | ||
186 | fit within a single byte (thanks, Jason Conti; LP: #1179202). | ||
187 | |||
188 | -- Colin Watson <cjwatson@debian.org> Mon, 13 May 2013 10:56:04 +0100 | ||
189 | |||
190 | openssh (1:6.2p1-2) unstable; urgency=low | ||
191 | |||
192 | * Fix build failure on Ubuntu: | ||
193 | - Include openbsd-compat/sys-queue.h from consolekit.c. | ||
194 | - Fix consolekit mismerges in monitor.c and monitor_wrap.c. | ||
195 | |||
196 | -- Colin Watson <cjwatson@debian.org> Thu, 09 May 2013 09:45:57 +0100 | ||
197 | |||
198 | openssh (1:6.2p1-1) unstable; urgency=low | ||
199 | |||
200 | * New upstream release (http://www.openssh.com/txt/release-6.2). | ||
201 | - Add support for multiple required authentication in SSH protocol 2 via | ||
202 | an AuthenticationMethods option (closes: #195716). | ||
203 | - Fix Sophie Germain formula in moduli(5) (closes: #698612). | ||
204 | - Update ssh-copy-id to Phil Hands' greatly revised version (closes: | ||
205 | #99785, #322228, #620428; LP: #518883, #835901, #1074798). | ||
206 | * Use dh-autoreconf. | ||
207 | |||
208 | -- Colin Watson <cjwatson@debian.org> Tue, 07 May 2013 11:48:16 +0100 | ||
209 | |||
210 | openssh (1:6.1p1-4) experimental; urgency=low | ||
211 | |||
212 | [ Gunnar Hjalmarsson ] | ||
213 | * debian/openssh-server.sshd.pam: Explicitly state that ~/.pam_environment | ||
214 | should be read, and move the pam_env calls from "auth" to "session" so | ||
215 | that it's also read when $HOME is encrypted (LP: #952185). | ||
216 | |||
217 | [ Stéphane Graber ] | ||
218 | * Add ssh-agent upstart user job. This implements something similar to | ||
219 | the 90x11-common_ssh-agent Xsession script. That is, start ssh-agent | ||
220 | and set the appropriate environment variables (closes: #703906). | ||
221 | |||
222 | -- Colin Watson <cjwatson@debian.org> Mon, 25 Mar 2013 16:58:04 +0000 | ||
223 | |||
224 | openssh (1:6.1p1-3) experimental; urgency=low | ||
225 | |||
226 | * Give ssh and ssh-krb5 versioned dependencies on openssh-client and | ||
227 | openssh-server, to try to reduce confusion when people run 'apt-get | ||
228 | install ssh' or similar and expect that to upgrade everything relevant. | ||
229 | * CVE-2010-5107: Improve DoS resistance by changing default of MaxStartups | ||
230 | to 10:30:100 (closes: #700102). | ||
231 | |||
232 | -- Colin Watson <cjwatson@debian.org> Fri, 08 Feb 2013 21:07:31 +0000 | ||
233 | |||
234 | openssh (1:6.1p1-2) experimental; urgency=low | ||
235 | |||
236 | * Use xz compression for binary packages. | ||
237 | * Merge from Ubuntu: | ||
238 | - Add support for registering ConsoleKit sessions on login. (This is | ||
239 | currently enabled only when building for Ubuntu.) | ||
240 | - Drop openssh-blacklist and openssh-blacklist-extra to Suggests. It's | ||
241 | been long enough since the relevant vulnerability that we shouldn't | ||
242 | need these installed by default nowadays. | ||
243 | - Add an Upstart job (not currently used by default in Debian). | ||
244 | - Add mention of ssh-keygen in ssh connect warning (Scott Moser). | ||
245 | - Install apport hooks. | ||
246 | * Only build with -j if DEB_BUILD_OPTIONS=parallel=* is used (closes: | ||
247 | #694282). | ||
248 | |||
249 | -- Colin Watson <cjwatson@debian.org> Mon, 26 Nov 2012 16:39:07 +0000 | ||
250 | |||
251 | openssh (1:6.1p1-1) experimental; urgency=low | ||
252 | |||
253 | * New upstream release (http://www.openssh.com/txt/release-6.1). | ||
254 | - Enable pre-auth sandboxing by default for new installs. | ||
255 | - Allow "PermitOpen none" to refuse all port-forwarding requests | ||
256 | (closes: #543683). | ||
257 | |||
258 | -- Colin Watson <cjwatson@debian.org> Fri, 07 Sep 2012 00:22:44 +0100 | ||
259 | |||
260 | openssh (1:6.0p1-3) unstable; urgency=low | ||
261 | |||
262 | * debconf template translations: | ||
263 | - Add Indonesian (thanks, Andika Triwidada; closes: #681670). | ||
264 | * Call restorecon on copied ~/.ssh/authorized_keys if possible, since some | ||
265 | SELinux policies require this (closes: #658675). | ||
266 | * Add ncurses-term to openssh-server's Recommends, since it's often needed | ||
267 | to support unusual terminal emulators on clients (closes: #675362). | ||
268 | |||
269 | -- Colin Watson <cjwatson@debian.org> Fri, 24 Aug 2012 06:55:36 +0100 | ||
270 | |||
271 | openssh (1:6.0p1-2) unstable; urgency=low | ||
272 | |||
273 | * Tighten libssl1.0.0 and libcrypto1.0.0-udeb dependencies to the current | ||
274 | "fix" version at build time (closes: #678661). | ||
275 | |||
276 | -- Colin Watson <cjwatson@debian.org> Sun, 24 Jun 2012 12:16:06 +0100 | ||
277 | |||
278 | openssh (1:6.0p1-1) unstable; urgency=low | ||
279 | |||
280 | [ Roger Leigh ] | ||
281 | * Display dynamic part of MOTD from /run/motd.dynamic, if it exists | ||
282 | (closes: #669699). | ||
283 | |||
284 | [ Colin Watson ] | ||
285 | * Update OpenSSH FAQ to revision 1.113, fixing missing line break (closes: | ||
286 | #669667). | ||
287 | * New upstream release (closes: #671010, | ||
288 | http://www.openssh.org/txt/release-6.0). | ||
289 | - Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections | ||
290 | (closes: #643312, #650512, #671075). | ||
291 | - Add a new privilege separation sandbox implementation for Linux's new | ||
292 | seccomp sandbox, automatically enabled on platforms that support it. | ||
293 | (Note: privilege separation sandboxing is still experimental.) | ||
294 | * Fix a bashism in configure's seccomp_filter check. | ||
295 | * Add a sandbox fallback mechanism, so that behaviour on Linux depends on | ||
296 | whether the running system's kernel has seccomp_filter support, not the | ||
297 | build system's kernel (forwarded upstream as | ||
298 | https://bugzilla.mindrot.org/show_bug.cgi?id=2011). | ||
299 | |||
300 | -- Colin Watson <cjwatson@debian.org> Sat, 26 May 2012 13:48:14 +0100 | ||
301 | |||
302 | openssh (1:5.9p1-5) unstable; urgency=low | ||
303 | |||
304 | * Use dpkg-buildflags, including for hardening support; drop use of | ||
305 | hardening-includes. | ||
306 | * Fix cross-building: | ||
307 | - Allow using a cross-architecture pkg-config. | ||
308 | - Pass default LDFLAGS to contrib/Makefile. | ||
309 | - Allow dh_strip to strip gnome-ssh-askpass, rather than calling | ||
310 | 'install -s'. | ||
311 | |||
312 | -- Colin Watson <cjwatson@debian.org> Mon, 02 Apr 2012 11:20:33 +0100 | ||
313 | |||
314 | openssh (1:5.9p1-4) unstable; urgency=low | ||
315 | |||
316 | * Disable OpenSSL version check again, as its SONAME is sufficient | ||
317 | nowadays (closes: #664383). | ||
318 | |||
319 | -- Colin Watson <cjwatson@debian.org> Mon, 19 Mar 2012 11:06:30 +0000 | ||
320 | |||
321 | openssh (1:5.9p1-3) unstable; urgency=low | ||
322 | |||
323 | * debconf template translations: | ||
324 | - Update Polish (thanks, Michał Kułach; closes: #659829). | ||
325 | * Ignore errors writing to console in init script (closes: #546743). | ||
326 | * Move ssh-krb5 to Section: oldlibs. | ||
327 | |||
328 | -- Colin Watson <cjwatson@debian.org> Fri, 24 Feb 2012 08:56:18 +0000 | ||
329 | |||
330 | openssh (1:5.9p1-2) unstable; urgency=low | ||
331 | |||
332 | * Mark openssh-client and openssh-server as Multi-Arch: foreign. | ||
333 | |||
334 | -- Colin Watson <cjwatson@debian.org> Wed, 09 Nov 2011 02:06:48 +0000 | ||
335 | |||
336 | openssh (1:5.9p1-1) unstable; urgency=low | ||
337 | |||
338 | * New upstream release (http://www.openssh.org/txt/release-5.9). | ||
339 | - Introduce sandboxing of the pre-auth privsep child using an optional | ||
340 | sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables | ||
341 | mandatory restrictions on the syscalls the privsep child can perform. | ||
342 | - Add new SHA256-based HMAC transport integrity modes from | ||
343 | http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt. | ||
344 | - The pre-authentication sshd(8) privilege separation slave process now | ||
345 | logs via a socket shared with the master process, avoiding the need to | ||
346 | maintain /dev/log inside the chroot (closes: #75043, #429243, | ||
347 | #599240). | ||
348 | - ssh(1) now warns when a server refuses X11 forwarding (closes: | ||
349 | #504757). | ||
350 | - sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths, | ||
351 | separated by whitespace (closes: #76312). The authorized_keys2 | ||
352 | fallback is deprecated but documented (closes: #560156). | ||
353 | - ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4 | ||
354 | ToS/DSCP (closes: #498297). | ||
355 | - ssh-add(1) now accepts keys piped from standard input. E.g. "ssh-add | ||
356 | - < /path/to/key" (closes: #229124). | ||
357 | - Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691). | ||
358 | - Say "required" rather than "recommended" in unprotected-private-key | ||
359 | warning (LP: #663455). | ||
360 | * Update OpenSSH FAQ to revision 1.112. | ||
361 | |||
362 | -- Colin Watson <cjwatson@debian.org> Wed, 07 Sep 2011 23:46:00 +0100 | ||
363 | |||
364 | openssh (1:5.8p1-7) unstable; urgency=low | ||
365 | |||
366 | * Only recommend ssh-import-id when built on Ubuntu (closes: #635887). | ||
367 | * Use 'dpkg-vendor --derives-from Ubuntu' to detect Ubuntu systems rather | ||
368 | than 'lsb_release -is' so that Ubuntu derivatives behave the same way as | ||
369 | Ubuntu itself. | ||
370 | |||
371 | -- Colin Watson <cjwatson@debian.org> Fri, 29 Jul 2011 14:27:52 +0100 | ||
372 | |||
373 | openssh (1:5.8p1-6) unstable; urgency=low | ||
374 | |||
375 | * openssh-client and openssh-server Suggests: monkeysphere. | ||
376 | * Quieten logs when multiple from= restrictions are used in different | ||
377 | authorized_keys lines for the same key; it's still not ideal, but at | ||
378 | least you'll only get one log entry per key (closes: #630606). | ||
379 | * Merge from Ubuntu (Dustin Kirkland): | ||
380 | - openssh-server Recommends: ssh-import-id (no-op in Debian since that | ||
381 | package doesn't exist there, but this reduces the Ubuntu delta). | ||
382 | |||
383 | -- Colin Watson <cjwatson@debian.org> Thu, 28 Jul 2011 17:10:18 +0100 | ||
384 | |||
385 | openssh (1:5.8p1-5) unstable; urgency=low | ||
386 | |||
387 | * Drop openssh-server's dependency on openssh-blacklist to a | ||
388 | recommendation (closes: #622604). | ||
389 | * Update Vcs-* fields and README.source for Alioth changes. | ||
390 | * Backport from upstream: | ||
391 | - Make hostbased auth with ECDSA keys work correctly (closes: #633368). | ||
392 | |||
393 | -- Colin Watson <cjwatson@debian.org> Sun, 24 Jul 2011 11:06:47 +0100 | ||
394 | |||
395 | openssh (1:5.8p1-4) unstable; urgency=low | ||
396 | |||
397 | * Drop hardcoded dependencies on libssl0.9.8 and libcrypto0.9.8-udeb, | ||
398 | since the required minimum versions are rather old now anyway and | ||
399 | openssl has bumped its SONAME (thanks, Julien Cristau; closes: #620828). | ||
400 | * Remove unreachable code from openssh-server.postinst. | ||
401 | |||
402 | -- Colin Watson <cjwatson@debian.org> Mon, 04 Apr 2011 15:56:18 +0100 | ||
403 | |||
404 | openssh (1:5.8p1-3) unstable; urgency=low | ||
405 | |||
406 | * Correct ssh-keygen instruction in the changelog for 1:5.7p1-1 (thanks, | ||
407 | Joel Stanley). | ||
408 | * Allow ssh-add to read from FIFOs (thanks, Daniel Kahn Gillmor; closes: | ||
409 | #614897). | ||
410 | |||
411 | -- Colin Watson <cjwatson@debian.org> Fri, 18 Mar 2011 16:42:42 +0000 | ||
412 | |||
413 | openssh (1:5.8p1-2) unstable; urgency=low | ||
414 | |||
415 | * Upload to unstable. | ||
416 | |||
417 | -- Colin Watson <cjwatson@debian.org> Tue, 08 Feb 2011 10:59:17 +0000 | ||
418 | |||
419 | openssh (1:5.8p1-1) experimental; urgency=low | ||
420 | |||
421 | * New upstream release (http://www.openssh.org/txt/release-5.8): | ||
422 | - Fix stack information leak in legacy certificate signing | ||
423 | (http://www.openssh.com/txt/legacy-cert.adv). | ||
424 | |||
425 | -- Colin Watson <cjwatson@debian.org> Sat, 05 Feb 2011 11:13:11 +0000 | ||
426 | |||
427 | openssh (1:5.7p1-2) experimental; urgency=low | ||
428 | |||
429 | * Fix crash in ssh_selinux_setfscreatecon when SELinux is disabled | ||
430 | (LP: #708571). | ||
431 | |||
432 | -- Colin Watson <cjwatson@debian.org> Thu, 27 Jan 2011 12:14:17 +0000 | ||
433 | |||
434 | openssh (1:5.7p1-1) experimental; urgency=low | ||
435 | |||
436 | * New upstream release (http://www.openssh.org/txt/release-5.7): | ||
437 | - Implement Elliptic Curve Cryptography modes for key exchange (ECDH) | ||
438 | and host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA | ||
439 | offer better performance than plain DH and DSA at the same equivalent | ||
440 | symmetric key length, as well as much shorter keys. | ||
441 | - sftp(1)/sftp-server(8): add a protocol extension to support a hard | ||
442 | link operation. It is available through the "ln" command in the | ||
443 | client. The old "ln" behaviour of creating a symlink is available | ||
444 | using its "-s" option or through the preexisting "symlink" command. | ||
445 | - scp(1): Add a new -3 option to scp: Copies between two remote hosts | ||
446 | are transferred through the local host (closes: #508613). | ||
447 | - ssh(1): "atomically" create the listening mux socket by binding it on | ||
448 | a temporary name and then linking it into position after listen() has | ||
449 | succeeded. This allows the mux clients to determine that the server | ||
450 | socket is either ready or stale without races (closes: #454784). | ||
451 | Stale server sockets are now automatically removed (closes: #523250). | ||
452 | - ssh(1): install a SIGCHLD handler to reap expired child process | ||
453 | (closes: #594687). | ||
454 | - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent | ||
455 | temporary directories (closes: #357469, although only if you arrange | ||
456 | for ssh-agent to actually see $TMPDIR since the setgid bit will cause | ||
457 | it to be stripped off). | ||
458 | * Update to current GSSAPI patch from | ||
459 | http://www.sxw.org.uk/computing/patches/openssh-5.7p1-gsskex-all-20110125.patch: | ||
460 | - Add GSSAPIServerIdentity option. | ||
461 | * Generate ECDSA host keys on fresh installations. Upgraders who wish to | ||
462 | add such host keys should manually add 'HostKey | ||
463 | /etc/ssh/ssh_host_ecdsa_key' to /etc/ssh/sshd_config and run 'ssh-keygen | ||
464 | -q -f /etc/ssh/ssh_host_ecdsa_key -N "" -t ecdsa'. | ||
465 | * Build-depend on libssl-dev (>= 0.9.8g) to ensure sufficient ECC support. | ||
466 | * Backport SELinux build fix from CVS. | ||
467 | * Rearrange selinux-role.patch so that it links properly given this | ||
468 | SELinux build fix. | ||
469 | |||
470 | -- Colin Watson <cjwatson@debian.org> Wed, 26 Jan 2011 23:48:02 +0000 | ||
471 | |||
472 | openssh (1:5.6p1-3) experimental; urgency=low | ||
473 | |||
474 | * Drop override for desktop-file-but-no-dh_desktop-call, which Lintian no | ||
475 | longer issues. | ||
476 | * Merge 1:5.5p1-6. | ||
477 | |||
478 | -- Colin Watson <cjwatson@debian.org> Thu, 30 Dec 2010 11:48:00 +0000 | ||
479 | |||
480 | openssh (1:5.6p1-2) experimental; urgency=low | ||
481 | |||
482 | * Backport upstream patch to install a SIGCHLD handler to reap expired ssh | ||
483 | child processes, preventing lots of zombies when using ControlPersist | ||
484 | (closes: #594687). | ||
485 | |||
486 | -- Colin Watson <cjwatson@debian.org> Tue, 26 Oct 2010 14:46:40 +0100 | ||
487 | |||
488 | openssh (1:5.6p1-1) experimental; urgency=low | ||
489 | |||
490 | * New upstream release (http://www.openssh.com/txt/release-5.6): | ||
491 | - Added a ControlPersist option to ssh_config(5) that automatically | ||
492 | starts a background ssh(1) multiplex master when connecting. This | ||
493 | connection can stay alive indefinitely, or can be set to automatically | ||
494 | close after a user-specified duration of inactivity (closes: #335697, | ||
495 | #350898, #454787, #500573, #550262). | ||
496 | - Support AuthorizedKeysFile, AuthorizedPrincipalsFile, | ||
497 | HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5) | ||
498 | Match blocks (closes: #549858). | ||
499 | - sftp(1): fix ls in working directories that contain globbing | ||
500 | characters in their pathnames (LP: #530714). | ||
501 | |||
502 | -- Colin Watson <cjwatson@debian.org> Tue, 24 Aug 2010 00:37:54 +0100 | ||
503 | |||
504 | openssh (1:5.5p1-6) unstable; urgency=low | ||
505 | |||
506 | * Touch /var/run/sshd/.placeholder in the preinst so that /var/run/sshd, | ||
507 | which is intentionally no longer shipped in the openssh-server package | ||
508 | due to /var/run often being a temporary directory, is not removed on | ||
509 | upgrade (closes: #575582). | ||
510 | |||
511 | -- Colin Watson <cjwatson@debian.org> Sun, 26 Dec 2010 18:09:29 +0000 | ||
512 | |||
513 | openssh (1:5.5p1-5) unstable; urgency=low | ||
514 | |||
515 | * Use an architecture wildcard for libselinux1-dev (closes: #591740). | ||
516 | * debconf template translations: | ||
517 | - Update Danish (thanks, Joe Hansen; closes: #592800). | ||
518 | |||
519 | -- Colin Watson <cjwatson@debian.org> Mon, 23 Aug 2010 22:59:03 +0100 | ||
520 | |||
521 | openssh (1:5.5p1-4) unstable; urgency=low | ||
522 | |||
523 | [ Sebastian Andrzej Siewior ] | ||
524 | * Add powerpcspe to architecture list for libselinux1-dev build-dependency | ||
525 | (closes: #579843). | ||
526 | |||
527 | [ Colin Watson ] | ||
528 | * Allow ~/.ssh/authorized_keys and other secure files to be | ||
529 | group-writable, provided that the group in question contains only the | ||
530 | file's owner; this extends a patch previously applied to ~/.ssh/config | ||
531 | (closes: #581919). | ||
532 | * Check primary group memberships as well as supplementary group | ||
533 | memberships, and only allow group-writability by groups with exactly one | ||
534 | member, as zero-member groups are typically used by setgid binaries | ||
535 | rather than being user-private groups (closes: #581697). | ||
536 | |||
537 | -- Colin Watson <cjwatson@debian.org> Sat, 22 May 2010 23:37:20 +0100 | ||
538 | |||
539 | openssh (1:5.5p1-3) unstable; urgency=low | ||
540 | |||
541 | * Discard error messages while checking whether rsh, rlogin, and rcp | ||
542 | alternatives exist (closes: #579285). | ||
543 | * Drop IDEA key check; I don't think it works properly any more due to | ||
544 | textual changes in error output, it's only relevant for direct upgrades | ||
545 | from truly ancient versions, and it breaks upgrades if | ||
546 | /etc/ssh/ssh_host_key can't be loaded (closes: #579570). | ||
547 | |||
548 | -- Colin Watson <cjwatson@debian.org> Wed, 28 Apr 2010 22:12:47 +0100 | ||
549 | |||
550 | openssh (1:5.5p1-2) unstable; urgency=low | ||
551 | |||
552 | * Use dh_installinit -n, since our maintainer scripts already handle this | ||
553 | more carefully (thanks, Julien Cristau). | ||
554 | |||
555 | -- Colin Watson <cjwatson@debian.org> Sat, 17 Apr 2010 12:55:56 +0100 | ||
556 | |||
557 | openssh (1:5.5p1-1) unstable; urgency=low | ||
558 | |||
559 | * New upstream release: | ||
560 | - Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative | ||
561 | paths. | ||
562 | - Include a language tag when sending a protocol 2 disconnection | ||
563 | message. | ||
564 | - Make logging of certificates used for user authentication more clear | ||
565 | and consistent between CAs specified using TrustedUserCAKeys and | ||
566 | authorized_keys. | ||
567 | |||
568 | -- Colin Watson <cjwatson@debian.org> Fri, 16 Apr 2010 10:27:30 +0100 | ||
569 | |||
570 | openssh (1:5.4p1-2) unstable; urgency=low | ||
571 | |||
572 | * Borrow patch from Fedora to add DNSSEC support: if glibc 2.11 is | ||
573 | installed, the host key is published in an SSHFP RR secured with DNSSEC, | ||
574 | and VerifyHostKeyDNS=yes, then ssh will no longer prompt for host key | ||
575 | verification (closes: #572049). | ||
576 | * Convert to dh(1), and use dh_installdocs --link-doc. | ||
577 | * Drop lpia support, since Ubuntu no longer supports this architecture. | ||
578 | * Use dh_install more effectively. | ||
579 | * Add a NEWS.Debian entry about changes in smartcard support relative to | ||
580 | previous unofficial builds (closes: #231472). | ||
581 | |||
582 | -- Colin Watson <cjwatson@debian.org> Sat, 10 Apr 2010 01:08:59 +0100 | ||
583 | |||
584 | openssh (1:5.4p1-1) unstable; urgency=low | ||
585 | |||
586 | * New upstream release (LP: #535029). | ||
587 | - After a transition period of about 10 years, this release disables SSH | ||
588 | protocol 1 by default. Clients and servers that need to use the | ||
589 | legacy protocol must explicitly enable it in ssh_config / sshd_config | ||
590 | or on the command-line. | ||
591 | - Remove the libsectok/OpenSC-based smartcard code and add support for | ||
592 | PKCS#11 tokens. This support is enabled by default in the Debian | ||
593 | packaging, since it now doesn't involve additional library | ||
594 | dependencies (closes: #231472, LP: #16918). | ||
595 | - Add support for certificate authentication of users and hosts using a | ||
596 | new, minimal OpenSSH certificate format (closes: #482806). | ||
597 | - Added a 'netcat mode' to ssh(1): "ssh -W host:port ...". | ||
598 | - Add the ability to revoke keys in sshd(8) and ssh(1). (For the Debian | ||
599 | package, this overlaps with the key blacklisting facility added in | ||
600 | openssh 1:4.7p1-9, but with different file formats and slightly | ||
601 | different scopes; for the moment, I've roughly merged the two.) | ||
602 | - Various multiplexing improvements, including support for requesting | ||
603 | port-forwardings via the multiplex protocol (closes: #360151). | ||
604 | - Allow setting an explicit umask on the sftp-server(8) commandline to | ||
605 | override whatever default the user has (closes: #496843). | ||
606 | - Many sftp client improvements, including tab-completion, more options, | ||
607 | and recursive transfer support for get/put (LP: #33378). The old | ||
608 | mget/mput commands never worked properly and have been removed | ||
609 | (closes: #270399, #428082). | ||
610 | - Do not prompt for a passphrase if we fail to open a keyfile, and log | ||
611 | the reason why the open failed to debug (closes: #431538). | ||
612 | - Prevent sftp from crashing when given a "-" without a command. Also, | ||
613 | allow whitespace to follow a "-" (closes: #531561). | ||
614 | |||
615 | * Fix 'debian/rules quilt-setup' to avoid writing .orig files if some | ||
616 | patches apply with offsets. | ||
617 | * Include debian/ssh-askpass-gnome.png in the Debian tarball now that | ||
618 | we're using a source format that permits this, rather than messing | ||
619 | around with uudecode. | ||
620 | * Drop compatibility with the old gssapi mechanism used in ssh-krb5 << | ||
621 | 3.8.1p1-1. Simon Wilkinson refused this patch since the old gssapi | ||
622 | mechanism was removed due to a serious security hole, and since these | ||
623 | versions of ssh-krb5 are no longer security-supported by Debian I don't | ||
624 | think there's any point keeping client compatibility for them. | ||
625 | * Fix substitution of ETC_PAM_D_SSH, following the rename in 1:4.7p1-4. | ||
626 | * Hardcode the location of xauth to /usr/bin/xauth rather than | ||
627 | /usr/bin/X11/xauth (thanks, Aron Griffis; closes: #575725, LP: #8440). | ||
628 | xauth no longer depends on x11-common, so we're no longer guaranteed to | ||
629 | have the /usr/bin/X11 symlink available. I was taking advantage of the | ||
630 | /usr/bin/X11 symlink to smooth X's move to /usr/bin, but this is far | ||
631 | enough in the past now that it's probably safe to just use /usr/bin. | ||
632 | * Remove SSHD_OOM_ADJUST configuration. sshd now unconditionally makes | ||
633 | itself non-OOM-killable, and doesn't require configuration to avoid log | ||
634 | spam in virtualisation containers (closes: #555625). | ||
635 | * Drop Debian-specific removal of OpenSSL version check. Upstream ignores | ||
636 | the two patchlevel nybbles now, which is sufficient to address the | ||
637 | original reason this change was introduced, and it appears that any | ||
638 | change in the major/minor/fix nybbles would involve a new libssl package | ||
639 | name. (We'd still lose if the status nybble were ever changed, but that | ||
640 | would mean somebody had packaged a development/beta version rather than | ||
641 | a proper release, which doesn't appear to be normal practice.) | ||
642 | * Drop most of our "LogLevel SILENT" (-qq) patch. This was originally | ||
643 | introduced to match the behaviour of non-free SSH, in which -q does not | ||
644 | suppress fatal errors, but matching the behaviour of OpenSSH upstream is | ||
645 | much more important nowadays. We no longer document that -q does not | ||
646 | suppress fatal errors (closes: #280609). Migrate "LogLevel SILENT" to | ||
647 | "LogLevel QUIET" in sshd_config on upgrade. | ||
648 | * Policy version 3.8.4: | ||
649 | - Add a Homepage field. | ||
650 | |||
651 | -- Colin Watson <cjwatson@debian.org> Tue, 06 Apr 2010 22:38:31 +0100 | ||
652 | |||
653 | openssh (1:5.3p1-3) unstable; urgency=low | ||
654 | |||
655 | * Convert to source format 3.0 (quilt). | ||
656 | * Update README.source to match, and add a 'quilt-setup' target to | ||
657 | debian/rules for the benefit of those checking out the package from | ||
658 | revision control. | ||
659 | * All patches are now maintained separately and tagged according to DEP-3. | ||
660 | * Add GSSAPIStoreCredentialsOnRekey to 'sshd -T' configuration dump. | ||
661 | * Remove documentation of building for Debian 3.0 in README.Debian. | ||
662 | Support for this was removed in 1:4.7p1-2. | ||
663 | * Remove obsolete header from README.Debian dating from when people | ||
664 | expected non-free SSH. | ||
665 | * Update copyright years for GSSAPI patch. | ||
666 | |||
667 | -- Colin Watson <cjwatson@debian.org> Sun, 28 Feb 2010 01:35:53 +0000 | ||
668 | |||
669 | openssh (1:5.3p1-2) unstable; urgency=low | ||
670 | |||
671 | * Link with -Wl,--as-needed (closes: #560155). | ||
672 | * Install upstream sshd_config as an example (closes: #415008). | ||
673 | * Use dh_lintian. | ||
674 | * Honour DEB_BUILD_OPTIONS=nocheck. | ||
675 | |||
676 | -- Colin Watson <cjwatson@debian.org> Mon, 22 Feb 2010 12:43:24 +0000 | ||
677 | |||
678 | openssh (1:5.3p1-1) unstable; urgency=low | ||
679 | |||
680 | * New upstream release. | ||
681 | * Update to GSSAPI patch from | ||
682 | http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch. | ||
683 | * Backport from upstream: | ||
684 | - Do not fall back to adding keys without constraints (ssh-add -c / -t | ||
685 | ...) when the agent refuses the constrained add request. This was a | ||
686 | useful migration measure back in 2002 when constraints were new, but | ||
687 | just adds risk now (LP: #209447). | ||
688 | * Drop change from 1:3.8p1-3 to avoid setresuid() and setresgid() system | ||
689 | calls. This only applied to Linux 2.2, which it's no longer feasible to | ||
690 | run anyway (see 1:5.2p1-2 changelog). | ||
691 | |||
692 | -- Colin Watson <cjwatson@debian.org> Tue, 26 Jan 2010 11:55:29 +0000 | ||
693 | |||
694 | openssh (1:5.2p1-2) unstable; urgency=low | ||
695 | |||
696 | [ Colin Watson ] | ||
697 | * Backport from upstream: | ||
698 | - After sshd receives a SIGHUP, ignore subsequent HUPs while sshd | ||
699 | re-execs itself. Prevents two HUPs in quick succession from resulting | ||
700 | in sshd dying (LP: #497781). | ||
701 | - Output a debug if we can't open an existing keyfile (LP: #505301). | ||
702 | * Use host compiler for ssh-askpass-gnome when cross-compiling. | ||
703 | * Don't run tests when cross-compiling. | ||
704 | * Drop change from 1:3.6.1p2-5 to disable cmsg_type check for file | ||
705 | descriptor passing when running on Linux 2.0. The previous stable | ||
706 | release of Debian dropped support for Linux 2.4, let alone 2.0, so this | ||
707 | very likely has no remaining users depending on it. | ||
708 | |||
709 | [ Kees Cook ] | ||
710 | * Implement DebianBanner server configuration flag that can be set to "no" | ||
711 | to allow sshd to run without the Debian-specific extra version in the | ||
712 | initial protocol handshake (closes: #562048). | ||
713 | |||
714 | -- Colin Watson <cjwatson@debian.org> Sat, 16 Jan 2010 01:28:58 +0000 | ||
715 | |||
716 | openssh (1:5.2p1-1) unstable; urgency=low | ||
717 | |||
718 | * New upstream release (closes: #536182). Yes, I know 5.3p1 has been out | ||
719 | for a while, but there's no GSSAPI patch available for it yet. | ||
720 | - Change the default cipher order to prefer the AES CTR modes and the | ||
721 | revised "arcfour256" mode to CBC mode ciphers that are susceptible to | ||
722 | CPNI-957037 "Plaintext Recovery Attack Against SSH". | ||
723 | - Add countermeasures to mitigate CPNI-957037-style attacks against the | ||
724 | SSH protocol's use of CBC-mode ciphers. Upon detection of an invalid | ||
725 | packet length or Message Authentication Code, ssh/sshd will continue | ||
726 | reading up to the maximum supported packet length rather than | ||
727 | immediately terminating the connection. This eliminates most of the | ||
728 | known differences in behaviour that leaked information about the | ||
729 | plaintext of injected data which formed the basis of this attack | ||
730 | (closes: #506115, LP: #379329). | ||
731 | - ForceCommand directive now accepts commandline arguments for the | ||
732 | internal-sftp server (closes: #524423, LP: #362511). | ||
733 | - Add AllowAgentForwarding to available Match keywords list (closes: | ||
734 | #540623). | ||
735 | - Make ssh(1) send the correct channel number for | ||
736 | SSH2_MSG_CHANNEL_SUCCESS and SSH2_MSG_CHANNEL_FAILURE messages to | ||
737 | avoid triggering 'Non-public channel' error messages on sshd(8) in | ||
738 | openssh-5.1. | ||
739 | - Avoid printing 'Non-public channel' warnings in sshd(8), since the | ||
740 | ssh(1) has sent incorrect channel numbers since ~2004 (this reverts a | ||
741 | behaviour introduced in openssh-5.1; closes: #496017). | ||
742 | - Disable nonfunctional ssh(1) ~C escape handler in multiplex slave | ||
743 | connections (closes: #507541). | ||
744 | - Fix "whitepsace" typo in ssh_config(5) (closes: #514313, LP: #303835). | ||
745 | * Update to GSSAPI patch from | ||
746 | http://www.sxw.org.uk/computing/patches/openssh-5.2p1-gsskex-all-20090726.patch, | ||
747 | including cascading credentials support (LP: #416958). | ||
748 | * Use x11.pc when compiling/linking gnome-ssh-askpass2 (closes: #555951). | ||
749 | * Moved to bzr.debian.org; add Vcs-Bzr and Vcs-Browser control fields. | ||
750 | * Add debian/README.source with instructions on bzr handling. | ||
751 | * Make ChrootDirectory work with SELinux (thanks, Russell Coker; closes: | ||
752 | #556644). | ||
753 | * Initialise sc to NULL in ssh_selinux_getctxbyname (thanks, Václav OvsÃk; | ||
754 | closes: #498684). | ||
755 | * Don't duplicate backslashes when displaying server banner (thanks, | ||
756 | Michał Górny; closes: #505378, LP: #425346). | ||
757 | * Use hardening-includes for hardening logic (thanks, Kees Cook; closes: | ||
758 | #561887). | ||
759 | * Update OpenSSH FAQ to revision 1.110. | ||
760 | * Remove ssh/new_config, only needed for direct upgrades from potato which | ||
761 | are no longer particularly feasible anyway (closes: #420682). | ||
762 | * Cope with insserv reordering of init script links. | ||
763 | * Remove init script stop link in rc1, as killprocs handles it already. | ||
764 | * Adjust short descriptions to avoid relying on previous experience with | ||
765 | rsh, based on suggestions from Reuben Thomas (closes: #512198). | ||
766 | * Remove manual page references to login.conf, which aren't applicable on | ||
767 | non-BSD systems (closes: #154434). | ||
768 | * Remove/adjust manual page references to BSD-specific /etc/rc (closes: | ||
769 | #513417). | ||
770 | * Refer to sshd_config(5) rather than sshd(8) in postinst-written | ||
771 | /etc/ssh/sshd_config, and add UsePAM commentary from upstream-shipped | ||
772 | configuration file (closes: #415008, although unfortunately this will | ||
773 | only be conveniently visible on new installations). | ||
774 | * Include URL to OpenBSD's ssl(8) in ssh(1), since I don't see a better | ||
775 | source for the same information among Debian's manual pages (closes: | ||
776 | #530692, LP: #456660). | ||
777 | |||
778 | -- Colin Watson <cjwatson@debian.org> Mon, 04 Jan 2010 13:23:35 +0000 | ||
779 | |||
780 | openssh (1:5.1p1-8) unstable; urgency=low | ||
781 | |||
782 | * Build with just -fPIC on mips/mipsel, not -fPIE as well (thanks, LIU Qi; | ||
783 | closes: #538313). | ||
784 | * Build-depend on libselinux1-dev on sh4 too (thanks, Nobuhiro Iwamatsu; | ||
785 | closes: #547103). | ||
786 | * Fix grammar in if-up script (closes: #549128). | ||
787 | * Pass $SSHD_OPTS when checking configuration too (thanks, "sobtwmxt"; | ||
788 | closes: #548662). | ||
789 | |||
790 | -- Colin Watson <cjwatson@debian.org> Mon, 05 Oct 2009 13:30:49 +0100 | ||
791 | |||
792 | openssh (1:5.1p1-7) unstable; urgency=low | ||
793 | |||
794 | * Update config.guess and config.sub from autotools-dev 20090611.1 | ||
795 | (closes: #538301). | ||
796 | * Set umask to 022 in the init script as well as postinsts (closes: | ||
797 | #539030). | ||
798 | * Add ${misc:Depends} to keep Lintian happy. | ||
799 | * Use 'which' rather than 'type' in maintainer scripts. | ||
800 | * Upgrade to debhelper v7. | ||
801 | |||
802 | -- Colin Watson <cjwatson@debian.org> Fri, 31 Jul 2009 16:28:10 +0100 | ||
803 | |||
804 | openssh (1:5.1p1-6) unstable; urgency=low | ||
805 | |||
806 | * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather | ||
807 | than O_RDWR. | ||
808 | * Disable OOM adjustment for vserver/OpenVZ (thanks, Karl Chen; closes: | ||
809 | #511771). | ||
810 | * Add ufw integration (thanks, Didier Roche; see | ||
811 | https://wiki.ubuntu.com/UbuntuFirewall#Integrating%20UFW%20with%20Packages; | ||
812 | LP: #261884). | ||
813 | * Add a comment above PermitRootLogin in sshd_config pointing to | ||
814 | README.Debian. | ||
815 | * Check if delgroup is present in openssh-client.postrm (closes: #530501). | ||
816 | * Build with -fPIC on mips/mipsel (thanks, Luk Claes; closes: #531942). | ||
817 | * Remove /var/run/sshd from openssh-server package; it will be created at | ||
818 | run-time before starting the server. | ||
819 | * Use invoke-rc.d in openssh-server's if-up script. | ||
820 | |||
821 | -- Colin Watson <cjwatson@debian.org> Fri, 05 Jun 2009 11:56:03 +0100 | ||
822 | |||
823 | openssh (1:5.1p1-5) unstable; urgency=low | ||
824 | |||
825 | * Backport from upstream CVS (Markus Friedl): | ||
826 | - packet_disconnect() on padding error, too. Should reduce the success | ||
827 | probability for the CPNI-957037 Plaintext Recovery Attack to 2^-18. | ||
828 | * Check that /var/run/sshd.pid exists and that the process ID listed there | ||
829 | corresponds to sshd before running '/etc/init.d/ssh reload' from if-up | ||
830 | script; SIGHUP is racy if called at boot before sshd has a chance to | ||
831 | install its signal handler, but fortunately the pid file is written | ||
832 | after that which lets us avoid the race (closes: #502444). | ||
833 | * While the above is a valuable sanity-check, it turns out that it doesn't | ||
834 | really fix the bug (thanks to Kevin Price for testing), so for the | ||
835 | meantime we'll just use '/etc/init.d/ssh restart', even though it is | ||
836 | unfortunately heavyweight. | ||
837 | |||
838 | -- Colin Watson <cjwatson@debian.org> Wed, 14 Jan 2009 00:34:08 +0000 | ||
839 | |||
840 | openssh (1:5.1p1-4) unstable; urgency=low | ||
841 | |||
842 | * ssh-copy-id: Strip trailing colons from hostname (closes: #226172, | ||
843 | LP: #249706; thanks to Karl Goetz for nudging this along; forwarded | ||
844 | upstream as https://bugzilla.mindrot.org/show_bug.cgi?id=1530). | ||
845 | * Backport from upstream CVS (Markus Friedl): | ||
846 | - Only send eow and no-more-sessions requests to openssh 5 and newer; | ||
847 | fixes interop problems with broken ssh v2 implementations (closes: | ||
848 | #495917). | ||
849 | * Fix double-free when failing to parse a forwarding specification given | ||
850 | using ~C (closes: #505330; forwarded upstream as | ||
851 | https://bugzilla.mindrot.org/show_bug.cgi?id=1539). | ||
852 | |||
853 | -- Colin Watson <cjwatson@debian.org> Sun, 23 Nov 2008 14:46:10 +0000 | ||
854 | |||
855 | openssh (1:5.1p1-3) unstable; urgency=low | ||
856 | |||
857 | * Remove unnecessary ssh-vulnkey output in non-verbose mode when no | ||
858 | compromised or unknown keys were found (closes: #496495). | ||
859 | * Configure with --disable-strip; dh_strip will deal with stripping | ||
860 | binaries and will honour DEB_BUILD_OPTIONS (thanks, Bernhard R. Link; | ||
861 | closes: #498681). | ||
862 | * Fix handling of zero-length server banners (thanks, Tomas Mraz; closes: | ||
863 | #497026). | ||
864 | |||
865 | -- Colin Watson <cjwatson@debian.org> Tue, 30 Sep 2008 23:09:58 +0100 | ||
866 | |||
867 | openssh (1:5.1p1-2) unstable; urgency=low | ||
868 | |||
869 | * Look for $SHELL on the path when executing ProxyCommands or | ||
870 | LocalCommands (closes: #492728). | ||
871 | |||
872 | -- Colin Watson <cjwatson@debian.org> Tue, 29 Jul 2008 15:31:25 +0100 | ||
873 | |||
874 | openssh (1:5.1p1-1) unstable; urgency=low | ||
875 | |||
876 | * New upstream release (closes: #474301). Important changes not previously | ||
877 | backported to 4.7p1: | ||
878 | - 4.9/4.9p1 (http://www.openssh.com/txt/release-4.9): | ||
879 | + Added chroot(2) support for sshd(8), controlled by a new option | ||
880 | "ChrootDirectory" (closes: #139047, LP: #24777). | ||
881 | + Linked sftp-server(8) into sshd(8). The internal sftp server is used | ||
882 | when the command "internal-sftp" is specified in a Subsystem or | ||
883 | ForceCommand declaration. When used with ChrootDirectory, the | ||
884 | internal sftp server requires no special configuration of files | ||
885 | inside the chroot environment. | ||
886 | + Added a protocol extension method "posix-rename@openssh.com" for | ||
887 | sftp-server(8) to perform POSIX atomic rename() operations; sftp(1) | ||
888 | prefers this if available (closes: #308561). | ||
889 | + Removed the fixed limit of 100 file handles in sftp-server(8). | ||
890 | + ssh(8) will now skip generation of SSH protocol 1 ephemeral server | ||
891 | keys when in inetd mode and protocol 2 connections are negotiated. | ||
892 | This speeds up protocol 2 connections to inetd-mode servers that | ||
893 | also allow Protocol 1. | ||
894 | + Accept the PermitRootLogin directive in a sshd_config(5) Match | ||
895 | block. Allows for, e.g. permitting root only from the local network. | ||
896 | + Reworked sftp(1) argument splitting and escaping to be more | ||
897 | internally consistent (i.e. between sftp commands) and more | ||
898 | consistent with sh(1). Please note that this will change the | ||
899 | interpretation of some quoted strings, especially those with | ||
900 | embedded backslash escape sequences. | ||
901 | + Support "Banner=none" in sshd_config(5) to disable sending of a | ||
902 | pre-login banner (e.g. in a Match block). | ||
903 | + ssh(1) ProxyCommands are now executed with $SHELL rather than | ||
904 | /bin/sh. | ||
905 | + ssh(1)'s ConnectTimeout option is now applied to both the TCP | ||
906 | connection and the SSH banner exchange (previously it just covered | ||
907 | the TCP connection). This allows callers of ssh(1) to better detect | ||
908 | and deal with stuck servers that accept a TCP connection but don't | ||
909 | progress the protocol, and also makes ConnectTimeout useful for | ||
910 | connections via a ProxyCommand. | ||
911 | + scp(1) incorrectly reported "stalled" on slow copies (closes: | ||
912 | #140828). | ||
913 | + scp(1) date underflow for timestamps before epoch. | ||
914 | + ssh(1) used the obsolete SIG DNS RRtype for host keys in DNS, | ||
915 | instead of the current standard RRSIG. | ||
916 | + Correctly drain ACKs when a sftp(1) upload write fails midway, | ||
917 | avoids a fatal() exit from what should be a recoverable condition. | ||
918 | + Fixed ssh-keygen(1) selective host key hashing (i.e. "ssh-keygen -HF | ||
919 | hostname") to not include any IP address in the data to be hashed. | ||
920 | + Make ssh(1) skip listening on the IPv6 wildcard address when a | ||
921 | binding address of 0.0.0.0 is used against an old SSH server that | ||
922 | does not support the RFC4254 syntax for wildcard bind addresses. | ||
923 | + Enable IPV6_V6ONLY socket option on sshd(8) listen socket, as is | ||
924 | already done for X11/TCP forwarding sockets (closes: #439661). | ||
925 | + Fix FD leak that could hang a ssh(1) connection multiplexing master. | ||
926 | + Make ssh(1) -q option documentation consistent with reality. | ||
927 | + Fixed sshd(8) PAM support not calling pam_session_close(), or | ||
928 | failing to call it with root privileges (closes: #372680). | ||
929 | + Fix activation of OpenSSL engine support when requested in configure | ||
930 | (LP: #119295). | ||
931 | + Cache SELinux status earlier so we know if it's enabled after a | ||
932 | chroot (LP: #237557). | ||
933 | - 5.1/5.1p1 (http://www.openssh.com/txt/release-5.1): | ||
934 | + Introduce experimental SSH Fingerprint ASCII Visualisation to ssh(1) | ||
935 | and ssh-keygen(1). Visual fingerprint display is controlled by a new | ||
936 | ssh_config(5) option "VisualHostKey". The intent is to render SSH | ||
937 | host keys in a visual form that is amenable to easy recall and | ||
938 | rejection of changed host keys. | ||
939 | + sshd_config(5) now supports CIDR address/masklen matching in "Match | ||
940 | address" blocks, with a fallback to classic wildcard matching. | ||
941 | + sshd(8) now supports CIDR matching in ~/.ssh/authorized_keys | ||
942 | from="..." restrictions, also with a fallback to classic wildcard | ||
943 | matching. | ||
944 | + Added an extended test mode (-T) to sshd(8) to request that it write | ||
945 | its effective configuration to stdout and exit. Extended test mode | ||
946 | also supports the specification of connection parameters (username, | ||
947 | source address and hostname) to test the application of | ||
948 | sshd_config(5) Match rules. | ||
949 | + ssh(1) now prints the number of bytes transferred and the overall | ||
950 | connection throughput for SSH protocol 2 sessions when in verbose | ||
951 | mode (previously these statistics were displayed for protocol 1 | ||
952 | connections only). | ||
953 | + sftp-server(8) now supports extension methods statvfs@openssh.com | ||
954 | and fstatvfs@openssh.com that implement statvfs(2)-like operations. | ||
955 | + sftp(1) now has a "df" command to the sftp client that uses the | ||
956 | statvfs@openssh.com to produce a df(1)-like display of filesystem | ||
957 | space and inode utilisation (requires statvfs@openssh.com support on | ||
958 | the server). | ||
959 | + Added a MaxSessions option to sshd_config(5) to allow control of the | ||
960 | number of multiplexed sessions supported over a single TCP | ||
961 | connection. This allows increasing the number of allowed sessions | ||
962 | above the previous default of 10, disabling connection multiplexing | ||
963 | (MaxSessions=1) or disallowing login/shell/subsystem sessions | ||
964 | entirely (MaxSessions=0). | ||
965 | + Added a no-more-sessions@openssh.com global request extension that | ||
966 | is sent from ssh(1) to sshd(8) when the client knows that it will | ||
967 | never request another session (i.e. when session multiplexing is | ||
968 | disabled). This allows a server to disallow further session requests | ||
969 | and terminate the session in cases where the client has been | ||
970 | hijacked. | ||
971 | + ssh-keygen(1) now supports the use of the -l option in combination | ||
972 | with -F to search for a host in ~/.ssh/known_hosts and display its | ||
973 | fingerprint. | ||
974 | + ssh-keyscan(1) now defaults to "rsa" (protocol 2) keys, instead of | ||
975 | "rsa1" (LP: #129794). | ||
976 | + Added an AllowAgentForwarding option to sshd_config(8) to control | ||
977 | whether authentication agent forwarding is permitted. Note that this | ||
978 | is a loose control, as a client may install their own unofficial | ||
979 | forwarder. | ||
980 | + ssh(1) and sshd(8): avoid unnecessary malloc/copy/free when | ||
981 | receiving network data, resulting in a ~10% speedup. | ||
982 | + ssh(1) and sshd(8) will now try additional addresses when connecting | ||
983 | to a port forward destination whose DNS name resolves to more than | ||
984 | one address. The previous behaviour was to try the only first | ||
985 | address and give up if that failed. | ||
986 | + ssh(1) and sshd(8) now support signalling that channels are | ||
987 | half-closed for writing, through a channel protocol extension | ||
988 | notification "eow@openssh.com". This allows propagation of closed | ||
989 | file descriptors, so that commands such as "ssh -2 localhost od | ||
990 | /bin/ls | true" do not send unnecessary data over the wire. | ||
991 | + sshd(8): increased the default size of ssh protocol 1 ephemeral keys | ||
992 | from 768 to 1024 bits. | ||
993 | + When ssh(1) has been requested to fork after authentication ("ssh | ||
994 | -f") with ExitOnForwardFailure enabled, delay the fork until after | ||
995 | replies for any -R forwards have been seen. Allows for robust | ||
996 | detection of -R forward failure when using -f. | ||
997 | + "Match group" blocks in sshd_config(5) now support negation of | ||
998 | groups. E.g. "Match group staff,!guests". | ||
999 | + sftp(1) and sftp-server(8) now allow chmod-like operations to set | ||
1000 | set[ug]id/sticky bits. | ||
1001 | + The MaxAuthTries option is now permitted in sshd_config(5) match | ||
1002 | blocks. | ||
1003 | + Multiplexed ssh(1) sessions now support a subset of the ~ escapes | ||
1004 | that are available to a primary connection. | ||
1005 | + ssh(1) connection multiplexing will now fall back to creating a new | ||
1006 | connection in most error cases (closes: #352830). | ||
1007 | + Make ssh(1) deal more gracefully with channel requests that fail. | ||
1008 | Previously it would optimistically assume that requests would always | ||
1009 | succeed, which could cause hangs if they did not (e.g. when the | ||
1010 | server runs out of file descriptors). | ||
1011 | + ssh(1) now reports multiplexing errors via the multiplex slave's | ||
1012 | stderr where possible (subject to LogLevel in the mux master). | ||
1013 | + Fixed an UMAC alignment problem that manifested on Itanium | ||
1014 | platforms. | ||
1015 | * Remove our local version of moduli(5) now that there's one upstream. | ||
1016 | * Say "GTK+" rather than "GTK" in ssh-askpass-gnome's description. | ||
1017 | * Add lintian overrides for empty /usr/share/doc/openssh-client | ||
1018 | directories in openssh-server and ssh (necessary due to being symlink | ||
1019 | targets). | ||
1020 | * Merge from Ubuntu: | ||
1021 | - Add 'status' action to openssh-server init script, requiring lsb-base | ||
1022 | (>= 3.2-13) (thanks, Dustin Kirkland). | ||
1023 | * debconf template translations: | ||
1024 | - Update Korean (thanks, Sunjae Park; closes: #484821). | ||
1025 | |||
1026 | -- Colin Watson <cjwatson@debian.org> Fri, 25 Jul 2008 10:45:08 +0100 | ||
1027 | |||
1028 | openssh (1:4.7p1-13) unstable; urgency=low | ||
1029 | |||
1030 | * Add some helpful advice to the end of ssh-vulnkey's output if there are | ||
1031 | unknown or compromised keys (thanks, Dan Jacobson; closes: #483756). | ||
1032 | * Check compromised key blacklist in ssh or ssh-add, as well as in the | ||
1033 | server (LP: #232391). To override the blacklist check in ssh | ||
1034 | temporarily, use 'ssh -o UseBlacklistedKeys=yes'; there is no override | ||
1035 | for the blacklist check in ssh-add. | ||
1036 | * Add cross-references to ssh-vulnkey(1) to ssh(1), ssh-add(1), | ||
1037 | ssh-keygen(1), and sshd(8) (closes: #484451). | ||
1038 | * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999 | ||
1039 | (thanks, Frans Pop). | ||
1040 | * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now | ||
1041 | takes care of that (thanks, Frans Pop; closes: #484404). | ||
1042 | * Update DEB_BUILD_OPTIONS parsing code from policy 3.8.0. | ||
1043 | * Add documentation on removing openssh-blacklist locally (see #484269). | ||
1044 | * Clarify documentation of SSHD_OOM_ADJUST, and make setting it to the | ||
1045 | empty string actually skip adjustment as intended (closes: #487325). | ||
1046 | * Remove empty /usr/share/applications directory in ssh-askpass-gnome. | ||
1047 | * debconf template translations: | ||
1048 | - Update Romanian (thanks, Cătălin Feștilă; closes: #485415). | ||
1049 | |||
1050 | -- Colin Watson <cjwatson@debian.org> Mon, 21 Jul 2008 12:18:28 +0100 | ||
1051 | |||
1052 | openssh (1:4.7p1-12) unstable; urgency=low | ||
1053 | |||
1054 | * Fill in CVE identifier for ssh-vulnkey bug fixed in 1:4.7p1-10. | ||
1055 | * Refactor rejection of blacklisted user keys into a single | ||
1056 | reject_blacklisted_key function in auth.c (thanks, Dmitry V. Levin). | ||
1057 | * Fix memory leak of blacklisted host keys (thanks, Dmitry V. Levin). | ||
1058 | * debconf template translations: | ||
1059 | - Update Dutch (thanks, Bart Cornelis; closes: #483004). | ||
1060 | - Update Brazilian Portuguese (thanks, Eder L. Marques; closes: | ||
1061 | #483142). | ||
1062 | - Update Slovak (thanks, Ivan Masár; closes: #483517). | ||
1063 | |||
1064 | -- Colin Watson <cjwatson@debian.org> Thu, 29 May 2008 21:41:29 +0100 | ||
1065 | |||
1066 | openssh (1:4.7p1-11) unstable; urgency=low | ||
1067 | |||
1068 | * Make init script depend on $syslog, and fix some other dependency | ||
1069 | glitches (thanks, Petter Reinholdtsen; closes: #481018). | ||
1070 | * Remove 0 and 6 from Default-Stop in init script (thanks, Kel Modderman; | ||
1071 | closes: #481151). | ||
1072 | * Restore OOM killer adjustment for child processes (thanks, Vaclav Ovsik; | ||
1073 | closes: #480020). | ||
1074 | * Allow building with heimdal-dev (LP: #125805). | ||
1075 | |||
1076 | * Check RSA1 keys without the need for a separate blacklist. Thanks to | ||
1077 | Simon Tatham for the idea. | ||
1078 | * Generate two keys with the PID forced to the same value and test that | ||
1079 | they differ, to defend against recurrences of the recent Debian OpenSSL | ||
1080 | vulnerability. | ||
1081 | * Recommend openssh-blacklist from openssh-client (closes: #481187). | ||
1082 | * Recommend openssh-blacklist-extra from openssh-client and | ||
1083 | openssh-server. | ||
1084 | * Make ssh-vulnkey report the file name and line number for each key | ||
1085 | (thanks, Heiko Schlittermann and Christopher Perry; closes: #481398). | ||
1086 | * Check for blacklists in /usr/share/ssh/ as well as /etc/ssh/ (see | ||
1087 | #481283). | ||
1088 | * Log IP addresses of hosts attempting to use blacklisted keys (closes: | ||
1089 | #481721). | ||
1090 | * Incorporate various ssh-vulnkey suggestions from Hugh Daniel: | ||
1091 | - Add -v (verbose) option, and don't print output for keys that have a | ||
1092 | blacklist file but that are not listed unless in verbose mode. | ||
1093 | - Move exit status documentation to a separate section. | ||
1094 | - Document key status descriptions. | ||
1095 | - Add key type to output. | ||
1096 | - Fix error output if ssh-vulnkey fails to read key files, with the | ||
1097 | exception of host keys unless -a was given. | ||
1098 | - In verbose mode, output the name of each file examined. | ||
1099 | * Handle leading IP addresses in ssh-vulnkey input (LP: #230497). | ||
1100 | * Fix various ssh-vulnkey problems pointed out by Solar Designer: | ||
1101 | - Fix some buffer handling inconsistencies. | ||
1102 | - Use xasprintf to build user key file names, avoiding truncation | ||
1103 | problems. | ||
1104 | - Drop to the user's UID when reading user keys with -a. | ||
1105 | - Use EUID rather than UID when run with no file names and without -a. | ||
1106 | - Reword "Unknown (no blacklist information)" to "Unknown (blacklist | ||
1107 | file not installed)". | ||
1108 | |||
1109 | * Fix typo in ssh/vulnerable_host_keys message (thanks, Esko Arajärvi). | ||
1110 | * debconf template translations: | ||
1111 | - Update Finnish (thanks, Esko Arajärvi; closes: #481530). | ||
1112 | - Update French (thanks, Christian Perrier; closes: #481576). | ||
1113 | - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #481591). | ||
1114 | - Update Galician (thanks, Jacobo Tarrio; closes: #481596). | ||
1115 | - Update Japanese (thanks, Kenshi Muto; closes: #481621). | ||
1116 | - Update Czech (thanks, Miroslav Kure; closes: #481624). | ||
1117 | - Update German (thanks, Helge Kreutzmann; closes: #481676). | ||
1118 | - Update Portuguese (thanks, Ricardo Silva; closes: #481781). | ||
1119 | - Update Basque (thanks, Piarres Beobide; closes: #481836). | ||
1120 | - Update Bulgarian (thanks, Damyan Ivanov; closes: #481870). | ||
1121 | - Update Vietnamese (thanks, Clytie Siddall; closes: #481876). | ||
1122 | - Update Spanish (thanks, Javier Fernandez-Sanguino Peña; closes: | ||
1123 | #482341). | ||
1124 | - Update Turkish (thanks, Mert Dirik; closes: #482548). | ||
1125 | - Update Russian (thanks, Yuri Kozlov; closes: #482887). | ||
1126 | - Update Swedish (thanks, Martin Bagge; closes: #482464). | ||
1127 | - Update Italian (thanks, Luca Monducci; closes: #482808). | ||
1128 | |||
1129 | -- Colin Watson <cjwatson@debian.org> Mon, 26 May 2008 12:21:39 +0100 | ||
1130 | |||
1131 | openssh (1:4.7p1-10) unstable; urgency=low | ||
1132 | |||
1133 | * Add a FILES section to ssh-vulnkey(1) (thanks, Hugh Daniel). | ||
1134 | * CVE-2008-2285: ssh-vulnkey handles options in authorized_keys | ||
1135 | (LP: #230029), and treats # as introducing a comment even if it is | ||
1136 | preceded by whitespace. | ||
1137 | |||
1138 | -- Colin Watson <cjwatson@debian.org> Wed, 14 May 2008 12:35:05 +0100 | ||
1139 | |||
1140 | openssh (1:4.7p1-9) unstable; urgency=critical | ||
1141 | |||
1142 | * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-8. | ||
1143 | * Mitigate OpenSSL security vulnerability (CVE-2008-0166): | ||
1144 | - Add key blacklisting support. Keys listed in | ||
1145 | /etc/ssh/blacklist.TYPE-LENGTH will be rejected for authentication by | ||
1146 | sshd, unless "PermitBlacklistedKeys yes" is set in | ||
1147 | /etc/ssh/sshd_config. | ||
1148 | - Add a new program, ssh-vulnkey, which can be used to check keys | ||
1149 | against these blacklists. | ||
1150 | - Depend on openssh-blacklist. | ||
1151 | - Force dependencies on libssl0.9.8 / libcrypto0.9.8-udeb to at least | ||
1152 | 0.9.8g-9. | ||
1153 | - Automatically regenerate known-compromised host keys, with a | ||
1154 | critical-priority debconf note. (I regret that there was no time to | ||
1155 | gather translations.) | ||
1156 | |||
1157 | -- Colin Watson <cjwatson@debian.org> Tue, 13 May 2008 12:33:38 +0100 | ||
1158 | |||
1159 | openssh (1:4.7p1-8) unstable; urgency=high | ||
1160 | |||
1161 | * Fill in CVE identifier for security vulnerability fixed in 1:4.7p1-5. | ||
1162 | * Rename KeepAlive to TCPKeepAlive in sshd_config, cleaning up from old | ||
1163 | configurations (LP: #211400). | ||
1164 | * Tweak scp's reporting of filenames in verbose mode to be a bit less | ||
1165 | confusing with spaces (thanks, Nicolas Valcárcel; LP: #89945). | ||
1166 | * Backport from 4.9p1: | ||
1167 | - CVE-2008-1657: Ignore ~/.ssh/rc if a sshd_config ForceCommand is | ||
1168 | specified. | ||
1169 | - Add no-user-rc authorized_keys option to disable execution of | ||
1170 | ~/.ssh/rc. | ||
1171 | * Backport from Simon Wilkinson's GSSAPI key exchange patch for 5.0p1: | ||
1172 | - Add code to actually implement GSSAPIStrictAcceptorCheck, which had | ||
1173 | somehow been omitted from a previous version of this patch (closes: | ||
1174 | #474246). | ||
1175 | |||
1176 | -- Colin Watson <cjwatson@debian.org> Sun, 06 Apr 2008 12:34:19 +0100 | ||
1177 | |||
1178 | openssh (1:4.7p1-7) unstable; urgency=low | ||
1179 | |||
1180 | * Ignore errors writing to oom_adj (closes: #473573). | ||
1181 | |||
1182 | -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2008 16:24:44 +0100 | ||
1183 | |||
1184 | openssh (1:4.7p1-6) unstable; urgency=low | ||
1185 | |||
1186 | * Disable the Linux kernel's OOM-killer for the sshd parent; tweak | ||
1187 | SSHD_OOM_ADJUST in /etc/default/ssh to change this (closes: #341767). | ||
1188 | |||
1189 | -- Colin Watson <cjwatson@debian.org> Sun, 30 Mar 2008 21:14:12 +0100 | ||
1190 | |||
1191 | openssh (1:4.7p1-5) unstable; urgency=low | ||
1192 | |||
1193 | * Recommends: xauth rather than Suggests: xbase-clients. | ||
1194 | * Document in ssh(1) that '-S none' disables connection sharing | ||
1195 | (closes: #471437). | ||
1196 | * Patch from Red Hat / Fedora: | ||
1197 | - CVE-2008-1483: Don't use X11 forwarding port which can't be bound on | ||
1198 | all address families, preventing hijacking of X11 forwarding by | ||
1199 | unprivileged users when both IPv4 and IPv6 are configured (closes: | ||
1200 | #463011). | ||
1201 | * Use printf rather than echo -en (a bashism) in openssh-server.config and | ||
1202 | openssh-server.preinst. | ||
1203 | * debconf template translations: | ||
1204 | - Update Finnish (thanks, Esko Arajärvi; closes: #468563). | ||
1205 | |||
1206 | -- Colin Watson <cjwatson@debian.org> Sat, 22 Mar 2008 12:37:00 +0000 | ||
1207 | |||
1208 | openssh (1:4.7p1-4) unstable; urgency=low | ||
1209 | |||
1210 | [ Caleb Case ] | ||
1211 | * Fix configure detection of getseuserbyname and | ||
1212 | get_default_context_with_level (closes: #465614, LP: #188136). | ||
1213 | |||
1214 | [ Colin Watson ] | ||
1215 | * Include the autogenerated debian/copyright in the source package. | ||
1216 | * Move /etc/pam.d/ssh to /etc/pam.d/sshd, allowing us to stop defining | ||
1217 | SSHD_PAM_SERVICE (closes: #255870). | ||
1218 | |||
1219 | -- Colin Watson <cjwatson@debian.org> Wed, 13 Feb 2008 18:18:52 +0000 | ||
1220 | |||
1221 | openssh (1:4.7p1-3) unstable; urgency=low | ||
1222 | |||
1223 | * Improve grammar of ssh-askpass-gnome description. | ||
1224 | * Backport from upstream: | ||
1225 | - Use the correct packet maximum sizes for remote port and agent | ||
1226 | forwarding. Prevents the server from killing the connection if too | ||
1227 | much data is queued and an excessively large packet gets sent | ||
1228 | (https://bugzilla.mindrot.org/show_bug.cgi?id=1360). | ||
1229 | * Allow passing temporary daemon parameters on the init script's command | ||
1230 | line, e.g. '/etc/init.d/ssh start "-o PermitRootLogin=yes"' (thanks, | ||
1231 | Marc Haber; closes: #458547). | ||
1232 | |||
1233 | -- Colin Watson <cjwatson@debian.org> Fri, 01 Feb 2008 21:59:59 +0000 | ||
1234 | |||
1235 | openssh (1:4.7p1-2) unstable; urgency=low | ||
1236 | |||
1237 | * Adjust many relative links in faq.html to point to | ||
1238 | http://www.openssh.org/ (thanks, Dan Jacobson; mentioned in #459807). | ||
1239 | * Pass --with-mantype=doc to configure rather than build-depending on | ||
1240 | groff (closes: #460121). | ||
1241 | * Add armel to architecture list for libselinux1-dev build-dependency | ||
1242 | (closes: #460136). | ||
1243 | * Drop source-compatibility with Debian 3.0: | ||
1244 | - Remove support for building with GNOME 1. This allows simplification | ||
1245 | of our GNOME build-dependencies (see #460136). | ||
1246 | - Remove hacks to support the old PAM configuration scheme. | ||
1247 | - Remove compatibility for building without po-debconf. | ||
1248 | * Build-depend on libgtk2.0-dev rather than libgnomeui-dev. As far as I | ||
1249 | can see, the GTK2 version of ssh-askpass-gnome has never required | ||
1250 | libgnomeui-dev. | ||
1251 | |||
1252 | -- Colin Watson <cjwatson@debian.org> Fri, 11 Jan 2008 00:14:10 +0000 | ||
1253 | |||
1254 | openssh (1:4.7p1-1) unstable; urgency=low | ||
1255 | |||
1256 | * New upstream release (closes: #453367). | ||
1257 | - CVE-2007-4752: Prevent ssh(1) from using a trusted X11 cookie if | ||
1258 | creation of an untrusted cookie fails; found and fixed by Jan Pechanec | ||
1259 | (closes: #444738). | ||
1260 | - sshd(8) in new installations defaults to SSH Protocol 2 only. Existing | ||
1261 | installations are unchanged. | ||
1262 | - The SSH channel window size has been increased, and both ssh(1) | ||
1263 | sshd(8) now send window updates more aggressively. These improves | ||
1264 | performance on high-BDP (Bandwidth Delay Product) networks. | ||
1265 | - ssh(1) and sshd(8) now preserve MAC contexts between packets, which | ||
1266 | saves 2 hash calls per packet and results in 12-16% speedup for | ||
1267 | arcfour256/hmac-md5. | ||
1268 | - A new MAC algorithm has been added, UMAC-64 (RFC4418) as | ||
1269 | "umac-64@openssh.com". UMAC-64 has been measured to be approximately | ||
1270 | 20% faster than HMAC-MD5. | ||
1271 | - Failure to establish a ssh(1) TunnelForward is now treated as a fatal | ||
1272 | error when the ExitOnForwardFailure option is set. | ||
1273 | - ssh(1) returns a sensible exit status if the control master goes away | ||
1274 | without passing the full exit status. | ||
1275 | - When using a ProxyCommand in ssh(1), set the outgoing hostname with | ||
1276 | gethostname(2), allowing hostbased authentication to work. | ||
1277 | - Make scp(1) skip FIFOs rather than hanging (closes: #246774). | ||
1278 | - Encode non-printing characters in scp(1) filenames. These could cause | ||
1279 | copies to be aborted with a "protocol error". | ||
1280 | - Handle SIGINT in sshd(8) privilege separation child process to ensure | ||
1281 | that wtmp and lastlog records are correctly updated. | ||
1282 | - Report GSSAPI mechanism in errors, for libraries that support multiple | ||
1283 | mechanisms. | ||
1284 | - Improve documentation for ssh-add(1)'s -d option. | ||
1285 | - Rearrange and tidy GSSAPI code, removing server-only code being linked | ||
1286 | into the client. | ||
1287 | - Delay execution of ssh(1)'s LocalCommand until after all forwardings | ||
1288 | have been established. | ||
1289 | - In scp(1), do not truncate non-regular files. | ||
1290 | - Improve exit message from ControlMaster clients. | ||
1291 | - Prevent sftp-server(8) from reading until it runs out of buffer space, | ||
1292 | whereupon it would exit with a fatal error (closes: #365541). | ||
1293 | - pam_end() was not being called if authentication failed | ||
1294 | (closes: #405041). | ||
1295 | - Manual page datestamps updated (closes: #433181). | ||
1296 | * Install the OpenSSH FAQ in /usr/share/doc/openssh-client. | ||
1297 | - Includes documentation on copying files with colons using scp | ||
1298 | (closes: #303453). | ||
1299 | * Create /var/run/sshd on start even if /etc/ssh/sshd_not_to_be_run exists | ||
1300 | (closes: #453285). | ||
1301 | * Fix "overriden" typo in ssh(1) (thanks, A. Costa; closes: #390699). | ||
1302 | * Refactor debian/rules configure and make invocations to make development | ||
1303 | easier. | ||
1304 | * Remove the hideously old /etc/ssh/primes on upgrade (closes: #123013). | ||
1305 | * Update moduli(5) to revision 1.11 from OpenBSD CVS. | ||
1306 | * Document the non-default options we set as standard in ssh_config(5) and | ||
1307 | sshd_config(5) (closes: #327886, #345628). | ||
1308 | * Recode LICENCE to UTF-8 when concatenating it to debian/copyright. | ||
1309 | * Override desktop-file-but-no-dh_desktop-call lintian warning; the | ||
1310 | .desktop file is intentionally not installed (see 1:3.8.1p1-10). | ||
1311 | * Update copyright dates for Kerberos patch in debian/copyright.head. | ||
1312 | * Policy version 3.7.3: no changes required. | ||
1313 | |||
1314 | -- Colin Watson <cjwatson@debian.org> Mon, 24 Dec 2007 16:43:02 +0000 | ||
1315 | |||
1316 | openssh (1:4.6p1-7) unstable; urgency=low | ||
1317 | |||
1318 | * Don't build PIE executables on m68k (closes: #451192). | ||
1319 | * Use autotools-dev's recommended configure --build and --host options. | ||
1320 | * Adjust README.Debian to suggest mailing debian-ssh@lists.debian.org | ||
1321 | rather than Matthew. | ||
1322 | * Check whether deluser exists in postrm (closes: #454085). | ||
1323 | |||
1324 | -- Colin Watson <cjwatson@debian.org> Mon, 03 Dec 2007 11:11:02 +0000 | ||
1325 | |||
1326 | openssh (1:4.6p1-6) unstable; urgency=low | ||
1327 | |||
1328 | * Remove blank line between head comment and first template in | ||
1329 | debian/openssh-server.templates.master; apparently it confuses some | ||
1330 | versions of debconf. | ||
1331 | * Install authorized_keys(5) as a symlink to sshd(8) (thanks, Tomas | ||
1332 | Pospisek; closes: #441817). | ||
1333 | * Discard error output from dpkg-query in preinsts, in case the ssh | ||
1334 | metapackage is not installed. | ||
1335 | * Fix sshd/inittab advice in README.Debian to account for rc.d movement | ||
1336 | (closes: #450632). | ||
1337 | * Suppress error from debian/rules if lsb-release is not installed. | ||
1338 | * Don't ignore errors from 'make -C contrib clean'. | ||
1339 | * Adjust categories in ssh-askpass-gnome.desktop to comply with the | ||
1340 | Desktop Menu Specification. | ||
1341 | * debconf template translations: | ||
1342 | - Add Slovak (thanks, Ivan Masár; closes: #441690). | ||
1343 | - Update Brazilian Portuguese (thanks, Eder L. Marques; | ||
1344 | closes: #447145). | ||
1345 | |||
1346 | -- Colin Watson <cjwatson@debian.org> Mon, 12 Nov 2007 11:47:28 +0000 | ||
1347 | |||
1348 | openssh (1:4.6p1-5) unstable; urgency=low | ||
1349 | |||
1350 | * Identify ssh as a metapackage rather than a transitional package. It's | ||
1351 | still useful as a quick way to install both the client and the server. | ||
1352 | * ssh-copy-id now checks the exit status of ssh-add -L (thanks, Adeodato | ||
1353 | Simó; closes: #221675). | ||
1354 | * ssh-copy-id no longer prints the output of expr (thanks, Peter | ||
1355 | Eisentraut; closes: #291534). | ||
1356 | * ssh-copy-id defaults to ~/.ssh/id_rsa.pub rather than | ||
1357 | ~/.ssh/identity.pub, in line with ssh-keygen (thanks, Greg Norris; | ||
1358 | closes: #234627). | ||
1359 | * Build-depend on libselinux1-dev on lpia. | ||
1360 | * openssh-client Suggests: keychain. | ||
1361 | * debconf template translations: | ||
1362 | - Update Catalan (thanks, Jordà Polo; closes: #431970). | ||
1363 | |||
1364 | -- Colin Watson <cjwatson@debian.org> Mon, 30 Jul 2007 09:34:38 +0100 | ||
1365 | |||
1366 | openssh (1:4.6p1-4) unstable; urgency=low | ||
1367 | |||
1368 | * Don't build PIE executables on hppa, as they crash. | ||
1369 | |||
1370 | -- Colin Watson <cjwatson@debian.org> Thu, 05 Jul 2007 11:06:54 +0100 | ||
1371 | |||
1372 | openssh (1:4.6p1-3) unstable; urgency=low | ||
1373 | |||
1374 | * Only build PIE executables on Linux and NetBSD (closes: #430455). | ||
1375 | * Fix broken switch fallthrough when SELinux is running in permissive mode | ||
1376 | (closes: #430838). | ||
1377 | * Document that HashKnownHosts may break tab-completion (closes: #430154). | ||
1378 | |||
1379 | -- Colin Watson <cjwatson@debian.org> Fri, 29 Jun 2007 07:15:38 +0100 | ||
1380 | |||
1381 | openssh (1:4.6p1-2) unstable; urgency=low | ||
1382 | |||
1383 | * Fix ordering of SYSLOG_LEVEL_QUIET and SYSLOG_LEVEL_FATAL. | ||
1384 | * Clarify that 'ssh -q -q' still prints errors caused by bad arguments | ||
1385 | (i.e. before the logging system is initialised). | ||
1386 | * Suppress "Connection to <host> closed" and "Connection to master closed" | ||
1387 | messages at loglevel SILENT (thanks, Jaap Eldering; closes: #409788). | ||
1388 | * Suppress "Pseudo-terminal will not be allocated because stdin is not a | ||
1389 | terminal" message at loglevels QUIET and SILENT (closes: #366814). | ||
1390 | * Document the SILENT loglevel in sftp-server(8), ssh_config(5), and | ||
1391 | sshd_config(5). | ||
1392 | * Add try-restart action to init script. | ||
1393 | * Add /etc/network/if-up.d/openssh-server to restart sshd when new | ||
1394 | interfaces appear (LP: #103436). | ||
1395 | * Backport from upstream: | ||
1396 | - Move C/R -> kbdint special case to after the defaults have been | ||
1397 | loaded, which makes ChallengeResponse default to yes again. This was | ||
1398 | broken by the Match changes and not fixed properly subsequently | ||
1399 | (closes: #428968). | ||
1400 | - Silence spurious error messages from hang-on-exit fix | ||
1401 | (http://bugzilla.mindrot.org/show_bug.cgi?id=1306, closes: #429531). | ||
1402 | |||
1403 | -- Colin Watson <cjwatson@debian.org> Wed, 20 Jun 2007 11:52:44 +0100 | ||
1404 | |||
1405 | openssh (1:4.6p1-1) unstable; urgency=low | ||
1406 | |||
1407 | * New upstream release (closes: #395507, #397961, #420035). Important | ||
1408 | changes not previously backported to 4.3p2: | ||
1409 | - 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4): | ||
1410 | + On portable OpenSSH, fix a GSSAPI authentication abort that could be | ||
1411 | used to determine the validity of usernames on some platforms. | ||
1412 | + Implemented conditional configuration in sshd_config(5) using the | ||
1413 | "Match" directive. This allows some configuration options to be | ||
1414 | selectively overridden if specific criteria (based on user, group, | ||
1415 | hostname and/or address) are met. So far a useful subset of | ||
1416 | post-authentication options are supported and more are expected to | ||
1417 | be added in future releases. | ||
1418 | + Add support for Diffie-Hellman group exchange key agreement with a | ||
1419 | final hash of SHA256. | ||
1420 | + Added a "ForceCommand" directive to sshd_config(5). Similar to the | ||
1421 | command="..." option accepted in ~/.ssh/authorized_keys, this forces | ||
1422 | the execution of the specified command regardless of what the user | ||
1423 | requested. This is very useful in conjunction with the new "Match" | ||
1424 | option. | ||
1425 | + Add a "PermitOpen" directive to sshd_config(5). This mirrors the | ||
1426 | permitopen="..." authorized_keys option, allowing fine-grained | ||
1427 | control over the port-forwardings that a user is allowed to | ||
1428 | establish. | ||
1429 | + Add optional logging of transactions to sftp-server(8). | ||
1430 | + ssh(1) will now record port numbers for hosts stored in | ||
1431 | ~/.ssh/known_hosts when a non-standard port has been requested | ||
1432 | (closes: #50612). | ||
1433 | + Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a | ||
1434 | non-zero exit code) when requested port forwardings could not be | ||
1435 | established. | ||
1436 | + Extend sshd_config(5) "SubSystem" declarations to allow the | ||
1437 | specification of command-line arguments. | ||
1438 | + Replacement of all integer overflow susceptible invocations of | ||
1439 | malloc(3) and realloc(3) with overflow-checking equivalents. | ||
1440 | + Many manpage fixes and improvements. | ||
1441 | + Add optional support for OpenSSL hardware accelerators (engines), | ||
1442 | enabled using the --with-ssl-engine configure option. | ||
1443 | + Tokens in configuration files may be double-quoted in order to | ||
1444 | contain spaces (closes: #319639). | ||
1445 | + Move a debug() call out of a SIGCHLD handler, fixing a hang when the | ||
1446 | session exits very quickly (closes: #307890). | ||
1447 | + Fix some incorrect buffer allocation calculations (closes: #410599). | ||
1448 | + ssh-add doesn't ask for a passphrase if key file permissions are too | ||
1449 | liberal (closes: #103677). | ||
1450 | + Likewise, ssh doesn't ask either (closes: #99675). | ||
1451 | - 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6): | ||
1452 | + sshd now allows the enabling and disabling of authentication methods | ||
1453 | on a per user, group, host and network basis via the Match directive | ||
1454 | in sshd_config. | ||
1455 | + Fixed an inconsistent check for a terminal when displaying scp | ||
1456 | progress meter (closes: #257524). | ||
1457 | + Fix "hang on exit" when background processes are running at the time | ||
1458 | of exit on a ttyful/login session (closes: #88337). | ||
1459 | * Update to current GSSAPI patch from | ||
1460 | http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch; | ||
1461 | install ChangeLog.gssapi. | ||
1462 | * Build the .deb --with-ssl-engine (closes: #408027, LP: #119295). | ||
1463 | * Use LSB functions in init scripts, and add an LSB-style header (partly | ||
1464 | from Ubuntu and partly thanks to Christian Perrier; closes: #389038). | ||
1465 | * Move init script start links to S16, move rc1 stop link to K84, and | ||
1466 | remove rc0 and rc6 stop links altogether (the last part from Ubuntu; | ||
1467 | closes: #122188). | ||
1468 | * Emit a slightly more informative message from the init script if | ||
1469 | /dev/null has somehow become not a character device (closes: #369964). | ||
1470 | * Belatedly build-depend on zlib1g-dev (>= 1:1.2.3-1) (closes: #333447). | ||
1471 | * Merge from Ubuntu: | ||
1472 | - Build position-independent executables (only for debs, not for udebs) | ||
1473 | to take advantage of address space layout randomisation. | ||
1474 | - If building on Ubuntu, add /sbin, /usr/sbin, and /usr/local/sbin to | ||
1475 | the default path. | ||
1476 | * Use ${binary:Version} rather than ${Source-Version} in openssh-server -> | ||
1477 | openssh-client dependency. | ||
1478 | |||
1479 | -- Colin Watson <cjwatson@debian.org> Wed, 13 Jun 2007 00:28:26 +0100 | ||
1480 | |||
1481 | openssh (1:4.3p2-11) unstable; urgency=low | ||
1482 | |||
1483 | * It's been four and a half years now since I took over as "temporary" | ||
1484 | maintainer, so the Maintainer field is getting a bit inaccurate. Set | ||
1485 | Maintainer to debian-ssh@lists.debian.org and leave Matthew and myself | ||
1486 | as Uploaders. | ||
1487 | * Use dpkg-query to fetch conffile md5sums rather than parsing | ||
1488 | /var/lib/dpkg/status directly. | ||
1489 | * openssh-client Suggests: libpam-ssh (closes: #427840). | ||
1490 | * Use 'start-stop-daemon --oknodo' so that openssh-server's init script | ||
1491 | exits successfully if sshd is already running (closes: #426858). | ||
1492 | |||
1493 | * Apply results of debconf templates and package descriptions review by | ||
1494 | debian-l10n-english (closes: #420107, #420742). | ||
1495 | * debconf template translations: | ||
1496 | - Update Dutch (thanks, Machteld de Kok; closes: #419260). | ||
1497 | - Update Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #420630). | ||
1498 | - Update Galician (thanks, Jacobo Tarrio; closes: #420635). | ||
1499 | - Update Spanish (thanks, Javier Fernández-Sanguino Peña; | ||
1500 | closes: #420651). | ||
1501 | - Update Swedish (thanks, Daniel Nylander; closes: #420663). | ||
1502 | - Add Bulgarian (thanks, Damyan Ivanov; closes: #420703). | ||
1503 | - Add Tamil (thanks, Tirumurti Vasudevan; closes: #420739). | ||
1504 | - Update German (thanks, Helge Kreutzmann; closes: #420743). | ||
1505 | - Update Japanese (thanks, Kenshi Muto; closes: #420946). | ||
1506 | - Add Basque (thanks, Piarres Beobide; closes: #421238). | ||
1507 | - Update Italian (thanks, Luca Monducci; closes: #421348). | ||
1508 | - Update Czech (thanks, Miroslav Kure; closes: #421484). | ||
1509 | - Update Romanian (thanks, Igor Stirbu; closes: #421760). | ||
1510 | - Update Russian (thanks, Yuriy Talakan' and Sergey Alyoshin; | ||
1511 | closes: #420862). | ||
1512 | - Update Dutch (thanks, Bart Cornelis; closes: #422767). | ||
1513 | - Update Portuguese (thanks, Ricardo Silva; closes: #423112). | ||
1514 | - Update French (thanks, Christian Perrier). | ||
1515 | - Add Korean (thanks, Sunjae Park; closes: #424008). | ||
1516 | - Update Vietnamese (thanks, Clytie Siddall; closes: #426991). | ||
1517 | |||
1518 | -- Colin Watson <cjwatson@debian.org> Sun, 10 Jun 2007 08:59:42 +0100 | ||
1519 | |||
1520 | openssh (1:4.3p2-10) unstable; urgency=low | ||
1521 | |||
1522 | * Multiply openssh-client-udeb's Installer-Menu-Item by 100. | ||
1523 | * Increase MAX_SESSIONS to 64. | ||
1524 | |||
1525 | -- Colin Watson <cjwatson@debian.org> Tue, 10 Apr 2007 19:17:20 +0100 | ||
1526 | |||
1527 | openssh (1:4.3p2-9) unstable; urgency=high | ||
1528 | |||
1529 | [ Russ Allbery ] | ||
1530 | * Fix GSSAPIKeyExchange configuration file handling logic in ssh-krb5 | ||
1531 | (closes: #404863). | ||
1532 | * Fix uncommenting of GSSAPI options by ssh-krb5 (closes: #407766). | ||
1533 | |||
1534 | [ Colin Watson ] | ||
1535 | * debconf template translations: | ||
1536 | - Add Norwegian Bokmål (thanks, Bjørn Steensrud; closes: #412330). | ||
1537 | |||
1538 | -- Colin Watson <cjwatson@debian.org> Mon, 5 Mar 2007 16:13:50 +0000 | ||
1539 | |||
1540 | openssh (1:4.3p2-8) unstable; urgency=medium | ||
1541 | |||
1542 | [ Vincent Untz ] | ||
1543 | * Give the ssh-askpass-gnome window a default icon; remove unnecessary | ||
1544 | icon extension from .desktop file (closes: | ||
1545 | https://launchpad.net/bugs/27152). | ||
1546 | |||
1547 | [ Colin Watson ] | ||
1548 | * Drop versioning on ssh/ssh-krb5 Replaces, as otherwise it isn't | ||
1549 | sufficient to replace conffiles (closes: #402804). | ||
1550 | * Make GSSAPICleanupCreds a compatibility alias for | ||
1551 | GSSAPICleanupCredentials. Mark GSSUseSessionCCache and | ||
1552 | GSSAPIUseSessionCredCache as known-but-unsupported options, and migrate | ||
1553 | away from them on upgrade. | ||
1554 | * It turns out that the people who told me that removing a conffile in the | ||
1555 | preinst was sufficient to have dpkg replace it without prompting when | ||
1556 | moving a conffile between packages were very much mistaken. As far as I | ||
1557 | can tell, the only way to do this reliably is to write out the desired | ||
1558 | new text of the conffile in the preinst. This is gross, and requires | ||
1559 | shipping the text of all conffiles in the preinst too, but there's | ||
1560 | nothing for it. Fortunately this nonsense is only required for smooth | ||
1561 | upgrades from sarge. | ||
1562 | * debconf template translations: | ||
1563 | - Add Romanian (thanks, Stan Ioan-Eugen; closes: #403528). | ||
1564 | |||
1565 | -- Colin Watson <cjwatson@debian.org> Sat, 23 Dec 2006 18:38:33 +0000 | ||
1566 | |||
1567 | openssh (1:4.3p2-7) unstable; urgency=medium | ||
1568 | |||
1569 | [ Colin Watson ] | ||
1570 | * Ignore errors from usermod when changing sshd's shell, since it will | ||
1571 | fail if the sshd user is not local (closes: #398436). | ||
1572 | * Remove version control tags from /etc/ssh/moduli and /etc/ssh/ssh_config | ||
1573 | to avoid unnecessary conffile resolution steps for administrators | ||
1574 | (thanks, Jari Aalto; closes: #335259). | ||
1575 | * Fix quoting error in configure.ac and regenerate configure (thanks, Ben | ||
1576 | Pfaff; closes: #391248). | ||
1577 | * When installing openssh-client or openssh-server from scratch, remove | ||
1578 | any unchanged conffiles from the pre-split ssh package to work around a | ||
1579 | bug in sarge's dpkg (thanks, Justin Pryzby and others; closes: #335276). | ||
1580 | |||
1581 | [ Russ Allbery ] | ||
1582 | * Create transitional ssh-krb5 package which enables GSSAPI configuration | ||
1583 | in sshd_config (closes: #390986). | ||
1584 | * Default client to attempting GSSAPI authentication. | ||
1585 | * Remove obsolete GSSAPINoMICAuthentication from sshd_config if it's | ||
1586 | found. | ||
1587 | * Add ssh -K option, the converse of -k, to enable GSSAPI credential | ||
1588 | delegation (closes: #401483). | ||
1589 | |||
1590 | -- Colin Watson <cjwatson@debian.org> Wed, 6 Dec 2006 23:00:49 +0000 | ||
1591 | |||
1592 | openssh (1:4.3p2-6) unstable; urgency=low | ||
1593 | |||
1594 | * Acknowledge NMU (thanks, Manoj; closes: #394795). | ||
1595 | * Backport from 4.5p1: | ||
1596 | - Fix a bug in the sshd privilege separation monitor that weakened its | ||
1597 | verification of successful authentication. This bug is not known to be | ||
1598 | exploitable in the absence of additional vulnerabilities. | ||
1599 | * openssh-server Suggests: molly-guard (closes: #395473). | ||
1600 | * debconf template translations: | ||
1601 | - Update German (thanks, Helge Kreutzmann; closes: #395947). | ||
1602 | |||
1603 | -- Colin Watson <cjwatson@debian.org> Wed, 15 Nov 2006 00:07:32 +0000 | ||
1604 | |||
1605 | openssh (1:4.3p2-5.1) unstable; urgency=low | ||
1606 | |||
1607 | * NMU to update SELinux patch, bringing it in line with current selinux | ||
1608 | releases. The patch for this NMU is simply the Bug#394795 patch, | ||
1609 | and no other changes. (closes: #394795) | ||
1610 | |||
1611 | -- Manoj Srivastava <srivasta@debian.org> Mon, 23 Oct 2006 14:11:24 -0500 | ||
1612 | |||
1613 | openssh (1:4.3p2-5) unstable; urgency=low | ||
1614 | |||
1615 | * Remove ssh/insecure_telnetd check altogether (closes: #391081). | ||
1616 | * debconf template translations: | ||
1617 | - Update Danish (thanks, Claus Hindsgaul; closes: #390612). | ||
1618 | |||
1619 | -- Colin Watson <cjwatson@debian.org> Thu, 5 Oct 2006 09:04:19 +0100 | ||
1620 | |||
1621 | openssh (1:4.3p2-4) unstable; urgency=high | ||
1622 | |||
1623 | * Backport from 4.4p1 (since I don't have an updated version of the GSSAPI | ||
1624 | patch yet): | ||
1625 | - CVE-2006-4924: Fix a pre-authentication denial of service found by | ||
1626 | Tavis Ormandy, that would cause sshd(8) to spin until the login grace | ||
1627 | time expired (closes: #389995). | ||
1628 | - CVE-2006-5051: Fix an unsafe signal hander reported by Mark Dowd. The | ||
1629 | signal handler was vulnerable to a race condition that could be | ||
1630 | exploited to perform a pre-authentication denial of service. On | ||
1631 | portable OpenSSH, this vulnerability could theoretically lead to | ||
1632 | pre-authentication remote code execution if GSSAPI authentication is | ||
1633 | enabled, but the likelihood of successful exploitation appears remote. | ||
1634 | |||
1635 | * Read /etc/default/locale as well as /etc/environment (thanks, Raphaël | ||
1636 | Hertzog; closes: #369395). | ||
1637 | * Remove no-longer-used ssh/insecure_rshd debconf template. | ||
1638 | * Make ssh/insecure_telnetd Type: error (closes: #388946). | ||
1639 | |||
1640 | * debconf template translations: | ||
1641 | - Update Portuguese (thanks, Rui Branco; closes: #381942). | ||
1642 | - Update Spanish (thanks, Javier Fernández-Sanguino Peña; | ||
1643 | closes: #382966). | ||
1644 | |||
1645 | -- Colin Watson <cjwatson@debian.org> Fri, 29 Sep 2006 16:28:24 +0100 | ||
1646 | |||
1647 | openssh (1:4.3p2-3) unstable; urgency=low | ||
1648 | |||
1649 | * Document KeepAlive->TCPKeepAlive renaming in sshd_config(5) (closes: | ||
1650 | https://launchpad.net/bugs/50702). | ||
1651 | * Change sshd user's shell to /usr/sbin/nologin (closes: #366541). | ||
1652 | Introduces dependency on passwd for usermod. | ||
1653 | * debconf template translations: | ||
1654 | - Update French (thanks, Denis Barbier; closes: #368503). | ||
1655 | - Update Dutch (thanks, Bart Cornelis; closes: #375100). | ||
1656 | - Update Japanese (thanks, Kenshi Muto; closes: #379950). | ||
1657 | |||
1658 | -- Colin Watson <cjwatson@debian.org> Thu, 27 Jul 2006 00:12:36 +0100 | ||
1659 | |||
1660 | openssh (1:4.3p2-2) unstable; urgency=low | ||
1661 | |||
1662 | * Include commented-out pam_access example in /etc/pam.d/ssh. | ||
1663 | * On '/etc/init.d/ssh restart', create /var/run/sshd before checking the | ||
1664 | server configuration, as otherwise 'sshd -t' will complain about the | ||
1665 | lack of /var/run/sshd (closes: https://launchpad.net/bugs/45234). | ||
1666 | * debconf template translations: | ||
1667 | - Update Russian (thanks, Yuriy Talakan'; closes: #367143). | ||
1668 | - Update Czech (thanks, Miroslav Kure; closes: #367161). | ||
1669 | - Update Italian (thanks, Luca Monducci; closes: #367186). | ||
1670 | - Update Galician (thanks, Jacobo Tarrio; closes: #367318). | ||
1671 | - Update Swedish (thanks, Daniel Nylander; closes: #367971). | ||
1672 | |||
1673 | -- Colin Watson <cjwatson@debian.org> Fri, 19 May 2006 09:14:27 +0100 | ||
1674 | |||
1675 | openssh (1:4.3p2-1) unstable; urgency=low | ||
1676 | |||
1677 | * New upstream release (closes: #361032). | ||
1678 | - CVE-2006-0225: scp (as does rcp, on which it is based) invoked a | ||
1679 | subshell to perform local to local, and remote to remote copy | ||
1680 | operations. This subshell exposed filenames to shell expansion twice; | ||
1681 | allowing a local attacker to create filenames containing shell | ||
1682 | metacharacters that, if matched by a wildcard, could lead to execution | ||
1683 | of attacker-specified commands with the privilege of the user running | ||
1684 | scp (closes: #349645). | ||
1685 | - Add support for tunneling arbitrary network packets over a connection | ||
1686 | between an OpenSSH client and server via tun(4) virtual network | ||
1687 | interfaces. This allows the use of OpenSSH (4.3+) to create a true VPN | ||
1688 | between the client and server providing real network connectivity at | ||
1689 | layer 2 or 3. This feature is experimental. | ||
1690 | - Reduce default key length for new DSA keys generated by ssh-keygen | ||
1691 | back to 1024 bits. DSA is not specified for longer lengths and does | ||
1692 | not fully benefit from simply making keys longer. As per FIPS 186-2 | ||
1693 | Change Notice 1, ssh-keygen will refuse to generate a new DSA key | ||
1694 | smaller or larger than 1024 bits. | ||
1695 | - Fixed X forwarding failing to start when the X11 client is executed in | ||
1696 | background at the time of session exit. | ||
1697 | - Change ssh-keygen to generate a protocol 2 RSA key when invoked | ||
1698 | without arguments (closes: #114894). | ||
1699 | - Fix timing variance for valid vs. invalid accounts when attempting | ||
1700 | Kerberos authentication. | ||
1701 | - Ensure that ssh always returns code 255 on internal error | ||
1702 | (closes: #259865). | ||
1703 | - Cleanup wtmp files on SIGTERM when not using privsep. | ||
1704 | - Set SO_REUSEADDR on X11 listeners to avoid problems caused by | ||
1705 | lingering sockets from previous session (X11 applications can | ||
1706 | sometimes not connect to 127.0.0.1:60xx) (closes: | ||
1707 | https://launchpad.net/bugs/25528). | ||
1708 | - Ensure that fds 0, 1 and 2 are always attached in all programs, by | ||
1709 | duping /dev/null to them if necessary. | ||
1710 | - Xauth list invocation had bogus "." argument. | ||
1711 | - Remove internal assumptions on key exchange hash algorithm and output | ||
1712 | length, preparing OpenSSH for KEX methods with alternate hashes. | ||
1713 | - Ignore junk sent by a server before it sends the "SSH-" banner. | ||
1714 | - Many manual page improvements. | ||
1715 | - Lots of cleanups, including fixes to memory leaks on error paths and | ||
1716 | possible crashes. | ||
1717 | * Update to current GSSAPI patch from | ||
1718 | http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch | ||
1719 | (closes: #352042). | ||
1720 | * debian/rules: Resynchronise CFLAGS with that generated by configure. | ||
1721 | * Restore pam_nologin to /etc/pam.d/ssh; sshd no longer checks this itself | ||
1722 | when PAM is enabled, but relies on PAM to do it. | ||
1723 | * Rename KeepAlive to TCPKeepAlive in default sshd_config | ||
1724 | (closes: #349896). | ||
1725 | * Rephrase ssh/new_config and ssh/encrypted_host_key_but_no_keygen debconf | ||
1726 | templates to make boolean short descriptions end with a question mark | ||
1727 | and to avoid use of the first person. | ||
1728 | * Ship README.tun. | ||
1729 | * Policy version 3.7.2: no changes required. | ||
1730 | * debconf template translations: | ||
1731 | - Update Italian (thanks, Luca Monducci; closes: #360348). | ||
1732 | - Add Galician (thanks, Jacobo Tarrio; closes: #361220). | ||
1733 | |||
1734 | -- Colin Watson <cjwatson@debian.org> Fri, 12 May 2006 12:48:24 +0100 | ||
1735 | |||
1736 | openssh (1:4.2p1-8) unstable; urgency=low | ||
1737 | |||
1738 | [ Frans Pop ] | ||
1739 | * Use udeb support introduced in debhelper 4.2.0 (available in sarge) | ||
1740 | rather than constructing udebs by steam. | ||
1741 | * Require debhelper 5.0.22, which generates correct shared library | ||
1742 | dependencies for udebs (closes: #360068). This build-dependency can be | ||
1743 | ignored if building on sarge. | ||
1744 | |||
1745 | [ Colin Watson ] | ||
1746 | * Switch to debhelper compatibility level 4, since we now require | ||
1747 | debhelper 4 even on sarge anyway for udeb support. | ||
1748 | |||
1749 | -- Colin Watson <cjwatson@debian.org> Fri, 31 Mar 2006 09:44:55 +0100 | ||
1750 | |||
1751 | openssh (1:4.2p1-7) unstable; urgency=low | ||
1752 | |||
1753 | * I accidentally applied the default $PATH change in 1:4.2p1-6 to the udeb | ||
1754 | rather than the deb. Fixed. | ||
1755 | |||
1756 | -- Colin Watson <cjwatson@debian.org> Wed, 1 Mar 2006 16:19:00 +0000 | ||
1757 | |||
1758 | openssh (1:4.2p1-6) unstable; urgency=low | ||
1759 | |||
1760 | * Sync default values of $PATH from shadow 1:4.0.12-6, adding /usr/bin/X11 | ||
1761 | to the normal and superuser paths and /usr/games to the normal path. | ||
1762 | * When the client receives a signal, don't fatal() with "Killed by signal | ||
1763 | %d." (which produces unhelpful noise on stderr and causes confusion for | ||
1764 | users of some applications that wrap ssh); instead, generate a debug | ||
1765 | message and exit with the traditional status (closes: #313371). | ||
1766 | * debconf template translations: | ||
1767 | - Add Swedish (thanks, Daniel Nylander; closes: #333133). | ||
1768 | - Update Spanish (thanks, Javier Fernández-Sanguino Peña; | ||
1769 | closes: #341371). | ||
1770 | - Correct erroneously-changed Last-Translator headers in Greek and | ||
1771 | Spanish translations. | ||
1772 | |||
1773 | -- Colin Watson <cjwatson@debian.org> Mon, 20 Feb 2006 16:50:55 +0000 | ||
1774 | |||
1775 | openssh (1:4.2p1-5) unstable; urgency=low | ||
1776 | |||
1777 | * Add a CVE name to the 1:4.0p1-1 changelog entry. | ||
1778 | * Build-depend on libselinux1-dev on armeb. | ||
1779 | * Only send GSSAPI proposal if GSSAPIAuthentication is enabled. | ||
1780 | * Build-depend on libssl-dev (>= 0.9.8-1) to cope with surprise OpenSSL | ||
1781 | transition, since otherwise who knows what the buildds will do. If | ||
1782 | you're building openssh yourself, you can safely ignore this and use an | ||
1783 | older libssl-dev. | ||
1784 | |||
1785 | -- Colin Watson <cjwatson@debian.org> Fri, 7 Oct 2005 12:23:42 +0100 | ||
1786 | |||
1787 | openssh (1:4.2p1-4) unstable; urgency=low | ||
1788 | |||
1789 | * Initialise token to GSS_C_EMPTY_BUFFER in ssh_gssapi_check_mechanism | ||
1790 | (closes: #328606). | ||
1791 | |||
1792 | -- Colin Watson <cjwatson@debian.org> Fri, 16 Sep 2005 12:50:16 +0100 | ||
1793 | |||
1794 | openssh (1:4.2p1-3) unstable; urgency=low | ||
1795 | |||
1796 | * Add prototype for ssh_gssapi_server_mechanisms (closes: #328372). | ||
1797 | * Interoperate with ssh-krb5 << 3.8.1p1-1 servers, which used a slightly | ||
1798 | different version of the gssapi authentication method (thanks, Aaron M. | ||
1799 | Ucko; closes: #328388). | ||
1800 | * Explicitly tell po2debconf to use the 'popular' output encoding, so that | ||
1801 | the woody-compatibility hack works even with po-debconf 0.9.0. | ||
1802 | |||
1803 | -- Colin Watson <cjwatson@debian.org> Thu, 15 Sep 2005 09:28:21 +0100 | ||
1804 | |||
1805 | openssh (1:4.2p1-2) unstable; urgency=low | ||
1806 | |||
1807 | * Annotate 1:4.2p1-1 changelog with CVE references. | ||
1808 | * Add remaining pieces of Kerberos support (closes: #152657, #275472): | ||
1809 | - Add GSSAPI key exchange support from | ||
1810 | http://www.sxw.org.uk/computing/patches/openssh.html (thanks, Stephen | ||
1811 | Frost). | ||
1812 | - Build-depend on libkrb5-dev and configure --with-kerberos5=/usr. | ||
1813 | - openssh-client and openssh-server replace ssh-krb5. | ||
1814 | - Update commented-out Kerberos/GSSAPI options in default sshd_config. | ||
1815 | - Fix HAVE_GSSAPI_KRB5_H/HAVE_GSSAPI_GSSAPI_KRB5_H typos in | ||
1816 | gss-serv-krb5.c. | ||
1817 | |||
1818 | -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 18:28:49 +0100 | ||
1819 | |||
1820 | openssh (1:4.2p1-1) unstable; urgency=low | ||
1821 | |||
1822 | * New upstream release. | ||
1823 | - SECURITY (CAN-2005-2797): Fix a bug introduced in OpenSSH 4.0 that | ||
1824 | caused GatewayPorts to be incorrectly activated for dynamic ("-D") | ||
1825 | port forwardings when no listen address was explicitly specified | ||
1826 | (closes: #326065). | ||
1827 | - SECURITY (CAN-2005-2798): Fix improper delegation of GSSAPI | ||
1828 | credentials. This code is only built in openssh-krb5, not openssh, but | ||
1829 | I mention the CVE reference here anyway for completeness. | ||
1830 | - Add a new compression method ("Compression delayed") that delays zlib | ||
1831 | compression until after authentication, eliminating the risk of zlib | ||
1832 | vulnerabilities being exploited by unauthenticated users. Note that | ||
1833 | users of OpenSSH versions earlier than 3.5 will need to disable | ||
1834 | compression on the client or set "Compression yes" (losing this | ||
1835 | security benefit) on the server. | ||
1836 | - Increase the default size of new RSA/DSA keys generated by ssh-keygen | ||
1837 | from 1024 to 2048 bits (closes: #181162). | ||
1838 | - Many bugfixes and improvements to connection multiplexing. | ||
1839 | - Don't pretend to accept $HOME (closes: #208648). | ||
1840 | * debian/rules: Resynchronise CFLAGS with that generated by configure. | ||
1841 | * openssh-client and openssh-server conflict with pre-split ssh to avoid | ||
1842 | problems when ssh is left un-upgraded (closes: #324695). | ||
1843 | * Set X11Forwarding to yes in the default sshd_config (new installs only). | ||
1844 | At least when X11UseLocalhost is turned on, which is the default, the | ||
1845 | security risks of using X11 forwarding are risks to the client, not to | ||
1846 | the server (closes: #320104). | ||
1847 | |||
1848 | -- Colin Watson <cjwatson@debian.org> Wed, 14 Sep 2005 15:16:14 +0100 | ||
1849 | |||
1850 | openssh (1:4.1p1-7) unstable; urgency=low | ||
1851 | |||
1852 | * Do the IDEA host key check on a temporary file to avoid altering | ||
1853 | /etc/ssh/ssh_host_key itself (closes: #312312). | ||
1854 | * Work around the ssh-askpass alternative somehow ending up in manual mode | ||
1855 | pointing to the obsolete /usr/lib/ssh/gnome-ssh-askpass. | ||
1856 | * Add GNU/kFreeBSD support (thanks, Aurelien Jarno; closes: #318113). | ||
1857 | * Fix XSIish uses of 'test' in openssh-server.preinst. | ||
1858 | * Policy version 3.6.2: no changes required. | ||
1859 | |||
1860 | -- Colin Watson <cjwatson@debian.org> Fri, 2 Sep 2005 16:18:11 +0100 | ||
1861 | |||
1862 | openssh (1:4.1p1-6) unstable; urgency=low | ||
1863 | |||
1864 | * Fix one-character typo that meant the binaries in openssh-client and | ||
1865 | openssh-server got recompiled with the wrong options during | ||
1866 | 'debian/rules install' (closes: #317088, #317238, #317241). | ||
1867 | |||
1868 | -- Colin Watson <cjwatson@debian.org> Thu, 7 Jul 2005 10:56:16 +0100 | ||
1869 | |||
1870 | openssh (1:4.1p1-5) unstable; urgency=low | ||
1871 | |||
1872 | * Build-depend on libselinux1-dev on ppc64 too (closes: #314625). | ||
1873 | * Drop priority of ssh to extra to match the override file. | ||
1874 | * Make /usr/share/doc/openssh-server and /usr/share/doc/ssh symlinks to | ||
1875 | /usr/share/doc/openssh-client (closes: #314745). | ||
1876 | * Ship README.dns (closes: #284874). | ||
1877 | * Disable btmp logging, since Debian's /var/log/btmp has inappropriate | ||
1878 | permissions (closes: #314956). | ||
1879 | * Allow ~/.ssh/config to be group-writable, provided that the group in | ||
1880 | question contains only the file's owner (closes: #314347). | ||
1881 | * debconf template translations: | ||
1882 | - Update Brazilian Portuguese (thanks, André LuÃs Lopes; | ||
1883 | closes: #315477). | ||
1884 | - Add Vietnamese (thanks, Clytie Siddall; closes: #316636). | ||
1885 | |||
1886 | -- Colin Watson <cjwatson@debian.org> Sun, 3 Jul 2005 17:08:08 +0100 | ||
1887 | |||
1888 | openssh (1:4.1p1-4) unstable; urgency=low | ||
1889 | |||
1890 | * openssh-client and openssh-server conflict with ssh-krb5, as ssh-krb5 | ||
1891 | only conflicts with ssh (closes: #312475). | ||
1892 | * SELinux support (thanks, Manoj Srivastava; closes: #308555): | ||
1893 | - Added SELinux capability, and turned it on be default. Added | ||
1894 | restorecon calls in preinst and postinst (should not matter if the | ||
1895 | machine is not SELinux aware). By and large, the changes made should | ||
1896 | have no effect unless the rules file calls --with-selinux; and even | ||
1897 | then there should be no performance hit for machines not actively | ||
1898 | running SELinux. | ||
1899 | - Modified the preinst and postinst to call restorecon to set the | ||
1900 | security context for the generated public key files. | ||
1901 | - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system | ||
1902 | may want to also include pam_selinux.so. | ||
1903 | * Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies | ||
1904 | are available. | ||
1905 | * Restore /usr/lib/sftp-server temporarily, as a symlink to | ||
1906 | /usr/lib/openssh/sftp-server (closes: #312891). | ||
1907 | * Switch to debhelper compatibility level 3, since 2 is deprecated. | ||
1908 | * debconf template translations: | ||
1909 | - Update German (thanks, Jens Seidel; closes: #313949). | ||
1910 | |||
1911 | -- Colin Watson <cjwatson@debian.org> Fri, 17 Jun 2005 14:20:20 +0100 | ||
1912 | |||
1913 | openssh (1:4.1p1-3) unstable; urgency=low | ||
1914 | |||
1915 | * Upload to unstable. | ||
1916 | |||
1917 | -- Colin Watson <cjwatson@debian.org> Mon, 6 Jun 2005 22:28:33 +0100 | ||
1918 | |||
1919 | openssh (1:4.1p1-2) experimental; urgency=low | ||
1920 | |||
1921 | * Drop debconf support for allowing SSH protocol 1, which is discouraged | ||
1922 | and has not been the default since openssh 1:3.0.1p1-1. Users who need | ||
1923 | this should edit sshd_config instead (closes: #147212). | ||
1924 | * Since ssh-keysign isn't used by default (you need to set | ||
1925 | EnableSSHKeysign to "yes" in /etc/ssh/ssh_config), having a debconf | ||
1926 | question to ask whether it should be setuid is overkill, and the | ||
1927 | question text had got out of date anyway. Remove this question, ship | ||
1928 | ssh-keysign setuid in openssh-client.deb, and set a statoverride if the | ||
1929 | debconf question was previously set to false. | ||
1930 | * Add lintian overrides for the above (setuid-binary, | ||
1931 | no-debconf-templates). | ||
1932 | * Fix picky lintian errors about slogin symlinks. | ||
1933 | * Fix DEB_HOST_ARCH_OS/DEB_HOST_GNU_SYSTEM compatibility handling. | ||
1934 | * Apply Linux 2.2 workaround (see #239999) only on Linux. | ||
1935 | |||
1936 | -- Colin Watson <cjwatson@debian.org> Thu, 2 Jun 2005 00:55:58 +0100 | ||
1937 | |||
1938 | openssh (1:4.1p1-1) experimental; urgency=low | ||
1939 | |||
1940 | * New upstream release. | ||
1941 | - Normalise socket addresses returned by get_remote_hostname(), fixing | ||
1942 | 4-in-6 mapping issues with AllowUsers et al (closes: #192234). | ||
1943 | * Take upstream's hint and disable the unsupported USE_POSIX_THREADS | ||
1944 | (closes: #295757, #308868, and possibly others; may open other bugs). | ||
1945 | Use PAM password authentication to avoid #278394. In future I may | ||
1946 | provide two sets of binaries built with and without this option, since | ||
1947 | it seems I can't win. | ||
1948 | * Disable ChallengeResponseAuthentication in new installations, returning | ||
1949 | to PasswordAuthentication by default, since it now supports PAM and | ||
1950 | apparently works better with a non-threaded sshd (closes: #247521). | ||
1951 | * openssh-server Suggests: rssh (closes: #233012). | ||
1952 | * Change libexecdir to /usr/lib/openssh, and fix up various alternatives | ||
1953 | and configuration files to match (closes: #87900, #151321). | ||
1954 | * Fix up very old sshd_config files that refer to /usr/libexec/sftp-server | ||
1955 | (closes: #141979). | ||
1956 | |||
1957 | -- Colin Watson <cjwatson@debian.org> Tue, 31 May 2005 01:33:33 +0100 | ||
1958 | |||
1959 | openssh (1:4.0p1-1) experimental; urgency=low | ||
1960 | |||
1961 | * New upstream release. | ||
1962 | - Port-forwarding specifications now take optional bind addresses, and | ||
1963 | the server allows client-specified bind addresses for remote port | ||
1964 | forwardings when configured with "GatewayPorts clientspecified" | ||
1965 | (closes: #87253, #192206). | ||
1966 | - ssh and ssh-keyscan now support hashing of known_hosts files for | ||
1967 | improved privacy (CAN-2005-2666). ssh-keygen has new options for | ||
1968 | managing known_hosts files, which understand hashing. | ||
1969 | - sftp supports command history and editing support using libedit | ||
1970 | (closes: #287013). | ||
1971 | - Have scp and sftp wait for the spawned ssh to exit before they exit | ||
1972 | themselves, allowing ssh to restore terminal modes (closes: #257130). | ||
1973 | - Improved the handling of bad data in authorized_keys files, | ||
1974 | eliminating fatal errors on corrupt or very large keys; e.g. linefeeds | ||
1975 | in keys only produce errors in auth.log now (closes: #220726). | ||
1976 | - Add "command mode" to ssh connection multiplexing (closes: #303452). | ||
1977 | - Mention $HOME/.hushlogin in sshd(8) FILES section (closes: #163933). | ||
1978 | * Make gnome-ssh-askpass stay above other windows (thanks, Liyang HU; | ||
1979 | closes: #296487). | ||
1980 | * Remove obsolete and unnecessary ssh/forward_warning debconf note. | ||
1981 | * Hurd build fixes (although sshd still doesn't work): | ||
1982 | - Restore X forwarding fix from #102991, lost somewhere along the way. | ||
1983 | - Link with -lcrypt. | ||
1984 | - Link with -lpthread rather than -pthread. | ||
1985 | - Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to | ||
1986 | satisfy build-dependencies. | ||
1987 | * Drop workaround for #242462 on amd64; it's been fixed properly upstream. | ||
1988 | * Enable HashKnownHosts by default. This only affects new entries; use | ||
1989 | 'ssh-keygen -H' to convert an entire known_hosts file to hashed format. | ||
1990 | * Note in ssh_config(5) that the SetupTimeOut option is Debian-specific | ||
1991 | (closes: #307069). | ||
1992 | * debconf template translations: | ||
1993 | - Update Czech (thanks, Miroslav Kure; closes: #298744). | ||
1994 | - Update Finnish (thanks, Matti Pöllä; closes: #303787). | ||
1995 | - Synchronise Spanish with sarge branch (thanks, Javier | ||
1996 | Fernández-Sanguino Peña; closes: #298536). | ||
1997 | - Add Ukrainian (thanks, Eugeniy Meshcheryakov; closes: #301852). | ||
1998 | |||
1999 | -- Colin Watson <cjwatson@debian.org> Thu, 26 May 2005 11:23:18 +0100 | ||
2000 | |||
2001 | openssh (1:3.9p1-3) experimental; urgency=low | ||
2002 | |||
2003 | * Explain how to run sshd from inittab in README.Debian (closes: #147360). | ||
2004 | * Add debian/watch file. | ||
2005 | |||
2006 | -- Colin Watson <cjwatson@debian.org> Fri, 18 Feb 2005 00:20:16 +0000 | ||
2007 | |||
2008 | openssh (1:3.9p1-2) experimental; urgency=low | ||
2009 | |||
2010 | * Remove pam_nologin from /etc/pam.d/ssh, as sshd's built-in support | ||
2011 | appears to be sufficient and more useful (closes: #162996). | ||
2012 | * Depend on debconf | debconf-2.0. | ||
2013 | * Drop LoginGraceTime back to the upstream default of two minutes on new | ||
2014 | installs (closes: #289573). | ||
2015 | * debconf template translations from Ubuntu bug #1232: | ||
2016 | - Update Greek (thanks, Logiotatidis George). | ||
2017 | - Update Spanish (thanks, Santiago Erquicia). | ||
2018 | |||
2019 | -- Colin Watson <cjwatson@debian.org> Sat, 15 Jan 2005 12:37:54 +0000 | ||
2020 | |||
2021 | openssh (1:3.9p1-1) experimental; urgency=low | ||
2022 | |||
2023 | * New upstream release. | ||
2024 | - PAM password authentication implemented again (closes: #238699, | ||
2025 | #242119). | ||
2026 | - Implemented the ability to pass selected environment variables between | ||
2027 | the client and the server. | ||
2028 | - Fix ssh-keyscan breakage when remote server doesn't speak SSH protocol | ||
2029 | (closes: #228828). | ||
2030 | - Fix res_query detection (closes: #242462). | ||
2031 | - 'ssh -c' documentation improved (closes: #265627). | ||
2032 | * Pass LANG and LC_* environment variables from the client by default, and | ||
2033 | accept them to the server by default in new installs, although not on | ||
2034 | upgrade (closes: #264024). | ||
2035 | * Build ssh in binary-indep, not binary-arch (thanks, LaMont Jones). | ||
2036 | * Expand on openssh-client package description (closes: #273831). | ||
2037 | |||
2038 | -- Colin Watson <cjwatson@debian.org> Tue, 4 Jan 2005 14:18:31 +0000 | ||
2039 | |||
2040 | openssh (1:3.8.1p1-14) experimental; urgency=low | ||
2041 | |||
2042 | * We use DH_COMPAT=2, so build-depend on debhelper (>= 2). | ||
2043 | * Fix timing information leak allowing discovery of invalid usernames in | ||
2044 | PAM keyboard-interactive authentication (backported from a patch by | ||
2045 | Darren Tucker; closes: #281595). | ||
2046 | * Make sure that there's a delay in PAM keyboard-interactive | ||
2047 | authentication when PermitRootLogin is not set to yes and the correct | ||
2048 | root password is entered (closes: #248747). | ||
2049 | |||
2050 | -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 18:09:37 +0000 | ||
2051 | |||
2052 | openssh (1:3.8.1p1-13) experimental; urgency=low | ||
2053 | |||
2054 | * Enable threading for PAM, on Sam Hartman's advice (closes: #278394). | ||
2055 | * debconf template translations: | ||
2056 | - Update Dutch (thanks, cobaco; closes: #278715). | ||
2057 | * Correct README.Debian's ForwardX11Trusted description (closes: #280190). | ||
2058 | |||
2059 | -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 12:03:13 +0000 | ||
2060 | |||
2061 | openssh (1:3.8.1p1-12) experimental; urgency=low | ||
2062 | |||
2063 | * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754). | ||
2064 | * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian | ||
2065 | 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH | ||
2066 | implementations apparently have problems with the long version string. | ||
2067 | This is of course a bug in those implementations, but since the extent | ||
2068 | of the problem is unknown it's best to play safe (closes: #275731). | ||
2069 | * debconf template translations: | ||
2070 | - Add Finnish (thanks, Matti Pöllä; closes: #265339). | ||
2071 | - Update Danish (thanks, Morten Brix Pedersen; closes: #275895). | ||
2072 | - Update French (thanks, Denis Barbier; closes: #276703). | ||
2073 | - Update Japanese (thanks, Kenshi Muto; closes: #277438). | ||
2074 | |||
2075 | -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 19:21:17 +0100 | ||
2076 | |||
2077 | openssh (1:3.8.1p1-11) experimental; urgency=high | ||
2078 | |||
2079 | * Move sshd_config(5) to openssh-server, where it belongs. | ||
2080 | * If PasswordAuthentication is disabled, then offer to disable | ||
2081 | ChallengeResponseAuthentication too. The current PAM code will attempt | ||
2082 | password-style authentication if ChallengeResponseAuthentication is | ||
2083 | enabled (closes: #250369). | ||
2084 | * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or | ||
2085 | later and then upgraded. Sorry about that ... for this reason, the | ||
2086 | default answer is to leave ChallengeResponseAuthentication enabled. | ||
2087 | |||
2088 | -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:28:20 +0100 | ||
2089 | |||
2090 | openssh (1:3.8.1p1-10) experimental; urgency=low | ||
2091 | |||
2092 | * Don't install the ssh-askpass-gnome .desktop file by default; I've had | ||
2093 | too many GNOME people tell me it's the wrong thing to be doing. I've | ||
2094 | left it in /usr/share/doc/ssh-askpass-gnome/examples/ for now. | ||
2095 | |||
2096 | -- Colin Watson <cjwatson@debian.org> Wed, 25 Aug 2004 18:18:14 +0100 | ||
2097 | |||
2098 | openssh (1:3.8.1p1-9) experimental; urgency=low | ||
2099 | |||
2100 | * Split the ssh binary package into openssh-client and openssh-server | ||
2101 | (closes: #39741). openssh-server depends on openssh-client for some | ||
2102 | common functionality; it didn't seem worth creating yet another package | ||
2103 | for this. openssh-client is priority standard, openssh-server optional. | ||
2104 | * New transitional ssh package, priority optional, depending on | ||
2105 | openssh-client and openssh-server. May be removed once nothing depends | ||
2106 | on it. | ||
2107 | * When upgrading from ssh to openssh-{client,server}, it's very difficult | ||
2108 | for the maintainer scripts to find out what version we're upgrading from | ||
2109 | without dodgy dpkg hackery. I've therefore taken the opportunity to move | ||
2110 | a couple of debconf notes into NEWS files, namely ssh/ssh2_keys_merged | ||
2111 | and ssh/user_environment_tell. | ||
2112 | * Add a heuristic to try to make sure the sshd_config upgrade to >= 3.7 | ||
2113 | happens even though we don't know what version we're upgrading from. | ||
2114 | * Remove /etc/ssh/sshd_not_to_be_run on purge of openssh-server. For now | ||
2115 | (until sarge+2) it's still honoured to avoid breaking existing | ||
2116 | configurations, but the right approach is now to remove the | ||
2117 | openssh-server package if you don't want to run the server. Add a NEWS | ||
2118 | item to that effect. | ||
2119 | |||
2120 | -- Colin Watson <cjwatson@debian.org> Mon, 2 Aug 2004 20:48:54 +0100 | ||
2121 | |||
2122 | openssh (1:3.8.1p1-8.sarge.4) unstable; urgency=high | ||
2123 | |||
2124 | * Fix timing information leak allowing discovery of invalid usernames in | ||
2125 | PAM keyboard-interactive authentication (backported from a patch by | ||
2126 | Darren Tucker; closes: #281595). | ||
2127 | * Make sure that there's a delay in PAM keyboard-interactive | ||
2128 | authentication when PermitRootLogin is not set to yes and the correct | ||
2129 | root password is entered (closes: #248747). | ||
2130 | |||
2131 | -- Colin Watson <cjwatson@debian.org> Sun, 28 Nov 2004 12:37:16 +0000 | ||
2132 | |||
2133 | openssh (1:3.8.1p1-8.sarge.3) unstable; urgency=low | ||
2134 | |||
2135 | * Enable threading for PAM, on Sam Hartman's advice (closes: #278394). | ||
2136 | * debconf template translations: | ||
2137 | - Update Dutch (thanks, cobaco; closes: #278715). | ||
2138 | * Correct README.Debian's ForwardX11Trusted description (closes: #280190). | ||
2139 | |||
2140 | -- Colin Watson <cjwatson@debian.org> Fri, 12 Nov 2004 10:31:12 +0000 | ||
2141 | |||
2142 | openssh (1:3.8.1p1-8.sarge.2) unstable; urgency=low | ||
2143 | |||
2144 | * Preserve /etc/ssh/sshd_config ownership/permissions (closes: #276754). | ||
2145 | * Shorten the version string from the form "OpenSSH_3.8.1p1 Debian | ||
2146 | 1:3.8.1p1-8.sarge.1" to "OpenSSH_3.8.1p1 Debian-8.sarge.1", as some SSH | ||
2147 | implementations apparently have problems with the long version string. | ||
2148 | This is of course a bug in those implementations, but since the extent | ||
2149 | of the problem is unknown it's best to play safe (closes: #275731). | ||
2150 | * debconf template translations: | ||
2151 | - Add Finnish (thanks, Matti Pöllä; closes: #265339). | ||
2152 | - Update Danish (thanks, Morten Brix Pedersen; closes: #275895). | ||
2153 | - Update French (thanks, Denis Barbier; closes: #276703). | ||
2154 | - Update Japanese (thanks, Kenshi Muto; closes: #277438). | ||
2155 | |||
2156 | -- Colin Watson <cjwatson@debian.org> Sun, 24 Oct 2004 17:57:14 +0100 | ||
2157 | |||
2158 | openssh (1:3.8.1p1-8.sarge.1) unstable; urgency=high | ||
2159 | |||
2160 | * If PasswordAuthentication is disabled, then offer to disable | ||
2161 | ChallengeResponseAuthentication too. The current PAM code will attempt | ||
2162 | password-style authentication if ChallengeResponseAuthentication is | ||
2163 | enabled (closes: #250369). | ||
2164 | * This will ask a question of anyone who installed fresh with 1:3.8p1-2 or | ||
2165 | later and then upgraded. Sorry about that ... for this reason, the | ||
2166 | default answer is to leave ChallengeResponseAuthentication enabled. | ||
2167 | |||
2168 | -- Colin Watson <cjwatson@debian.org> Wed, 6 Oct 2004 14:21:55 +0100 | ||
2169 | |||
2170 | openssh (1:3.8.1p1-8) unstable; urgency=high | ||
2171 | |||
2172 | * Matthew Vernon: | ||
2173 | - Add a GPL exception to the licensing terms of the Debian patch | ||
2174 | (closes: #211644). | ||
2175 | |||
2176 | -- Colin Watson <cjwatson@debian.org> Thu, 29 Jul 2004 13:28:47 +0100 | ||
2177 | |||
2178 | openssh (1:3.8.1p1-7) unstable; urgency=low | ||
2179 | |||
2180 | * Re-enable shadow password support in openssh-server-udeb, at Bastian | ||
2181 | Blank's request (closes: #260800). | ||
2182 | |||
2183 | -- Colin Watson <cjwatson@debian.org> Thu, 22 Jul 2004 10:56:06 +0100 | ||
2184 | |||
2185 | openssh (1:3.8.1p1-6) unstable; urgency=low | ||
2186 | |||
2187 | * Implement hack in | ||
2188 | http://lists.debian.org/debian-boot/2004/07/msg01207.html to get | ||
2189 | openssh-client-udeb to show up as a retrievable debian-installer | ||
2190 | component. | ||
2191 | * Generate host keys in postinst only if the relevant HostKey directives | ||
2192 | are found in sshd_config (closes: #87946). | ||
2193 | |||
2194 | -- Colin Watson <cjwatson@debian.org> Wed, 21 Jul 2004 15:14:46 +0100 | ||
2195 | |||
2196 | openssh (1:3.8.1p1-5) unstable; urgency=medium | ||
2197 | |||
2198 | * Update German debconf template translation (thanks, Helge Kreutzmann; | ||
2199 | closes: #252226). | ||
2200 | * Remove Suggests: dnsutils, as it was only needed for | ||
2201 | make-ssh-known-hosts (#93265), which has been replaced by ssh-keyscan. | ||
2202 | * Disable shadow password support in openssh-server-udeb. | ||
2203 | * Fix non-portable shell constructs in maintainer scripts, Makefile, and | ||
2204 | ssh-copy-id (thanks, David Weinehall; closes: #258517). | ||
2205 | * Apply patch from Darren Tucker to make the PAM authentication SIGCHLD | ||
2206 | handler kill the PAM thread if its waitpid() call returns 0, as well as | ||
2207 | the previous check for -1 (closes: #252676). | ||
2208 | * Add scp and sftp to openssh-client-udeb. It might not be very 'u' any | ||
2209 | more; oh well. | ||
2210 | |||
2211 | -- Colin Watson <cjwatson@debian.org> Sat, 10 Jul 2004 13:57:27 +0100 | ||
2212 | |||
2213 | openssh (1:3.8.1p1-4) unstable; urgency=medium | ||
2214 | |||
2215 | * Kill off PAM thread if privsep slave dies (closes: #248125). | ||
2216 | |||
2217 | -- Colin Watson <cjwatson@debian.org> Fri, 28 May 2004 17:58:45 -0300 | ||
2218 | |||
2219 | openssh (1:3.8.1p1-3) unstable; urgency=low | ||
2220 | |||
2221 | * Add ssh-keygen to openssh-server-udeb. | ||
2222 | |||
2223 | -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 16:31:52 +0100 | ||
2224 | |||
2225 | openssh (1:3.8.1p1-2) unstable; urgency=low | ||
2226 | |||
2227 | * Add Catalan debconf template translation (thanks, Aleix Badia i Bosch; | ||
2228 | closes: #248748). | ||
2229 | * openssh-client-udeb and openssh-server-udeb depend on libnss-files-udeb | ||
2230 | (not yet uploaded). | ||
2231 | * Restore ssh-askpass-gnome binary, lost by mistake. | ||
2232 | * Don't link against libnsl in udeb builds. | ||
2233 | |||
2234 | -- Colin Watson <cjwatson@debian.org> Thu, 20 May 2004 11:15:58 +0100 | ||
2235 | |||
2236 | openssh (1:3.8.1p1-1) unstable; urgency=low | ||
2237 | |||
2238 | * New upstream release. | ||
2239 | - Use a longer buffer for tty names in utmp (closes: #247538). | ||
2240 | * Make sure there's a newline at the end of sshd_config before adding | ||
2241 | 'UsePAM yes' (closes: #244829). | ||
2242 | * Generate a new .orig.tar.gz without RFC.nroff, and remove | ||
2243 | /usr/share/doc/ssh/RFC.gz (closes: #211640). It isn't DFSG-free and only | ||
2244 | documents the obsolete SSH1 protocol, not to mention that it was never a | ||
2245 | real RFC but only an Internet-Draft. It's available from | ||
2246 | http://www.free.lp.se/bamse/draft-ylonen-ssh-protocol-00.txt if you want | ||
2247 | it for some reason. | ||
2248 | * Add openssh-client-udeb and openssh-server-udeb binary packages for use | ||
2249 | in debian-installer. They still need libnss_files to be supplied in udeb | ||
2250 | form by glibc. | ||
2251 | * Work around lack of res_query weak alias in libresolv on amd64 (see | ||
2252 | #242462, awaiting real fix upstream). | ||
2253 | * Fix grammar in sshd(8) (closes: #238753). | ||
2254 | * Add .desktop file and icon for ssh-askpass-gnome (closes: #232333). | ||
2255 | * Update Polish debconf template translation (thanks, Emil Nowak; | ||
2256 | closes: #242808). | ||
2257 | * Add Turkish debconf template translation (thanks, Recai OktaÅŸ; | ||
2258 | closes: #246068). | ||
2259 | |||
2260 | -- Colin Watson <cjwatson@debian.org> Tue, 11 May 2004 23:38:10 +0100 | ||
2261 | |||
2262 | openssh (1:3.8p1-3) unstable; urgency=low | ||
2263 | |||
2264 | * Remove deprecated ReverseMappingCheck option from newly generated | ||
2265 | sshd_config files (closes: #239987). | ||
2266 | * Build everything apart from contrib in a subdirectory, to allow for | ||
2267 | multiple builds. | ||
2268 | * Some older kernels are missing setresuid() and setresgid(), so don't try | ||
2269 | to use them. setreuid() and setregid() will do well enough for our | ||
2270 | purposes (closes: #239999). | ||
2271 | |||
2272 | -- Colin Watson <cjwatson@debian.org> Mon, 5 Apr 2004 21:23:43 +0100 | ||
2273 | |||
2274 | openssh (1:3.8p1-2) unstable; urgency=medium | ||
2275 | |||
2276 | * Disable PasswordAuthentication for new installations (closes: #236810). | ||
2277 | * Turn off the new ForwardX11Trusted by default, returning to the | ||
2278 | semantics of 3.7 and earlier, since it seems immature and causes far too | ||
2279 | many problems with existing setups. See README.Debian for details | ||
2280 | (closes: #237021). | ||
2281 | |||
2282 | -- Colin Watson <cjwatson@debian.org> Wed, 10 Mar 2004 10:33:07 +0000 | ||
2283 | |||
2284 | openssh (1:3.8p1-1) unstable; urgency=low | ||
2285 | |||
2286 | * New upstream release (closes: #232281): | ||
2287 | - New PAM implementation based on that in FreeBSD. This runs PAM session | ||
2288 | modules before dropping privileges (closes: #132681, #150968). | ||
2289 | - Since PAM session modules are run as root, we can turn pam_limits back | ||
2290 | on by default, and it no longer spits out "Operation not permitted" to | ||
2291 | syslog (closes: #171673). | ||
2292 | - Password expiry works again (closes: #153235). | ||
2293 | - 'ssh -q' suppresses login banner (closes: #134589). | ||
2294 | - sshd doesn't lie to PAM about invalid usernames (closes: #157078). | ||
2295 | - ssh-add prints key comment on each prompt (closes: #181869). | ||
2296 | - Punctuation formatting fixed in man pages (closes: #191131). | ||
2297 | - EnableSSHKeysign documented in ssh_config(5) (closes: #224457). | ||
2298 | * Add 'UsePAM yes' to /etc/ssh/sshd_config on upgrade from versions older | ||
2299 | than this, to maintain the standard Debian sshd configuration. | ||
2300 | * Comment out PAMAuthenticationViaKbdInt and RhostsAuthentication in | ||
2301 | sshd_config on upgrade. Neither option is supported any more. | ||
2302 | * Privilege separation and PAM are now properly supported together, so | ||
2303 | remove both debconf questions related to them and simply set it | ||
2304 | unconditionally in newly generated sshd_config files (closes: #228838). | ||
2305 | * ServerAliveInterval implemented upstream, so ProtocolKeepAlives is now a | ||
2306 | compatibility alias. The semantics differ slightly, though; see | ||
2307 | ssh_config(5) for details. | ||
2308 | * Implement SSH1 support for ServerAliveInterval using SSH_MSG_IGNORE. As | ||
2309 | documented in ssh_config(5), it's not as good as the SSH2 version. | ||
2310 | * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and | ||
2311 | -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary. | ||
2312 | * Update config.guess and config.sub from autotools-dev 20040105.1. | ||
2313 | * Darren Tucker: | ||
2314 | - Reset signal status when starting pam auth thread, prevent hanging | ||
2315 | during PAM keyboard-interactive authentications. | ||
2316 | - Fix a non-security-critical segfault in PAM authentication. | ||
2317 | * Add debconf template translations: | ||
2318 | - Greek (thanks, Konstantinos Margaritis; closes: #232843). | ||
2319 | - Italian (thanks, Renato Gini; closes: #234777). | ||
2320 | |||
2321 | -- Colin Watson <cjwatson@debian.org> Sat, 6 Mar 2004 18:43:44 +0000 | ||
2322 | |||
2323 | openssh (1:3.6.1p2-12) unstable; urgency=low | ||
2324 | |||
2325 | * Update Spanish debconf template translation (thanks, Javier | ||
2326 | Fernández-Sanguino Peña; closes: #228242). | ||
2327 | * Add debconf template translations: | ||
2328 | - Czech (thanks, Miroslav Kure; closes: #230110). | ||
2329 | - Simplified Chinese (thanks, Hiei Xu; closes: #230726). | ||
2330 | |||
2331 | -- Colin Watson <cjwatson@debian.org> Wed, 11 Feb 2004 09:37:57 +0000 | ||
2332 | |||
2333 | openssh (1:3.6.1p2-11) unstable; urgency=low | ||
2334 | |||
2335 | * Comment out pam_limits in default configuration, for now at least | ||
2336 | (closes: #198254). | ||
2337 | * Use invoke-rc.d (if it exists) to run the init script. | ||
2338 | * Backport format string bug fix in sshconnect.c (closes: #225238). | ||
2339 | * ssh-copy-id exits if ssh fails (closes: #215252). | ||
2340 | |||
2341 | -- Colin Watson <cjwatson@debian.org> Sun, 4 Jan 2004 18:59:21 +0000 | ||
2342 | |||
2343 | openssh (1:3.6.1p2-10) unstable; urgency=low | ||
2344 | |||
2345 | * Use --retry in init script when restarting rather than sleeping, to make | ||
2346 | sure the old process is dead (thanks, Herbert Xu; closes: #212117). | ||
2347 | Depend on dpkg (>= 1.9.0) for start-stop-daemon's --retry option. | ||
2348 | * Update debconf template translations: | ||
2349 | - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #219844). | ||
2350 | - Danish (thanks, Morten Brix Pedersen; closes: #217964). | ||
2351 | - Japanese (thanks, Kenshi Muto; closes: #212497). | ||
2352 | - Russian (thanks, Ilgiz Kalmetev). | ||
2353 | - Spanish (thanks, Carlos Valdivia Yagüe; closes: #211832). | ||
2354 | * Add Dutch debconf template translation (thanks, cobaco; | ||
2355 | closes: #215372). | ||
2356 | * Update config.guess and config.sub from autotools-dev 20031007.1 | ||
2357 | (closes: #217696). | ||
2358 | * Implement New World Order for PAM configuration, including | ||
2359 | /etc/pam.d/common-* from /etc/pam.d/ssh (closes: #212959). | ||
2360 | - To backport this release to woody, you need to set DEB_BUILD_SSH_WOODY | ||
2361 | in your environment. See README.Debian. | ||
2362 | * Add more commentary to /etc/pam.d/ssh. | ||
2363 | |||
2364 | -- Colin Watson <cjwatson@debian.org> Sun, 16 Nov 2003 01:14:16 +0000 | ||
2365 | |||
2366 | openssh (1:3.6.1p2-9) unstable; urgency=high | ||
2367 | |||
2368 | * Merge even more buffer allocation fixes from upstream (CAN-2003-0682; | ||
2369 | closes: #211434). | ||
2370 | |||
2371 | -- Colin Watson <cjwatson@debian.org> Fri, 19 Sep 2003 10:25:25 +0100 | ||
2372 | |||
2373 | openssh (1:3.6.1p2-8) unstable; urgency=high | ||
2374 | |||
2375 | * Merge more buffer allocation fixes from new upstream version 3.7.1p1 | ||
2376 | (closes: #211324). | ||
2377 | |||
2378 | -- Colin Watson <cjwatson@debian.org> Wed, 17 Sep 2003 03:07:19 +0100 | ||
2379 | |||
2380 | openssh (1:3.6.1p2-7) unstable; urgency=high | ||
2381 | |||
2382 | * Update debconf template translations: | ||
2383 | - French (thanks, Christian Perrier; closes: #208801). | ||
2384 | - Japanese (thanks, Kenshi Muto; closes: #210380). | ||
2385 | * Some small improvements to the English templates courtesy of Christian | ||
2386 | Perrier. I've manually unfuzzied a few translations where it was | ||
2387 | obvious, on Christian's advice, but the others will have to be updated. | ||
2388 | * Document how to generate an RSA1 host key (closes: #141703). | ||
2389 | * Incorporate NMU fix for early buffer expansion vulnerability, | ||
2390 | CAN-2003-0693 (closes: #211205). Thanks to Michael Stone. | ||
2391 | |||
2392 | -- Colin Watson <cjwatson@debian.org> Tue, 16 Sep 2003 14:32:28 +0100 | ||
2393 | |||
2394 | openssh (1:3.6.1p2-6.0) unstable; urgency=high | ||
2395 | |||
2396 | * SECURITY: fix for CAN-2003-0693, buffer allocation error | ||
2397 | |||
2398 | -- Michael Stone <mstone@debian.org> Tue, 16 Sep 2003 08:27:07 -0400 | ||
2399 | |||
2400 | openssh (1:3.6.1p2-6) unstable; urgency=medium | ||
2401 | |||
2402 | * Use a more CVS-friendly means of setting SSH_VERSION. | ||
2403 | * Update Brazilian Portuguese debconf template translation (thanks, Andre | ||
2404 | Luis Lopes; closes: #208036). | ||
2405 | * Don't run 'sshd -t' in init script if the server isn't to be run | ||
2406 | (closes: #197576). | ||
2407 | * Fix login delay, spurious auth.log entry, and PermitRootLogin | ||
2408 | information leakage due to PAM issues with upstream's recent security | ||
2409 | update (thanks, Darren Tucker; closes: #99168, #192207, #193546). | ||
2410 | * Policy version 3.6.1: recode this changelog to UTF-8. | ||
2411 | |||
2412 | -- Colin Watson <cjwatson@debian.org> Wed, 3 Sep 2003 19:14:02 +0100 | ||
2413 | |||
2414 | openssh (1:3.6.1p2-5) unstable; urgency=low | ||
2415 | |||
2416 | * Disable cmsg_type check for file descriptor passing when running on | ||
2417 | Linux 2.0 (closes: #150976). Remove comments about non-functional | ||
2418 | privilege separation on 2.0 from ssh/privsep_ask and ssh/privsep_tell | ||
2419 | debconf questions and from README.Debian, since it should all now work. | ||
2420 | * Fix "defails" typo in generated sshd_config (closes: #206484). | ||
2421 | * Backport upstream patch to strip trailing whitespace (including | ||
2422 | newlines) from configuration directives (closes: #192079). | ||
2423 | |||
2424 | -- Colin Watson <cjwatson@debian.org> Wed, 27 Aug 2003 02:19:57 +0100 | ||
2425 | |||
2426 | openssh (1:3.6.1p2-4) unstable; urgency=low | ||
2427 | |||
2428 | * getent can get just one key; no need to use grep (thanks, James Troup). | ||
2429 | * Move /usr/local/bin to the front of the default path, following | ||
2430 | /etc/login.defs (closes: #201150). | ||
2431 | * Remove specifics of problematic countries from package description | ||
2432 | (closes: #197040). | ||
2433 | * Update Spanish debconf template translation (thanks, Carlos Valdivia | ||
2434 | Yagüe; closes: #198456). | ||
2435 | * Backport upstream patch to pass monitor signals through to child | ||
2436 | (closes: #164797). | ||
2437 | |||
2438 | -- Colin Watson <cjwatson@debian.org> Sun, 27 Jul 2003 17:31:15 +0100 | ||
2439 | |||
2440 | openssh (1:3.6.1p2-3) unstable; urgency=low | ||
2441 | |||
2442 | * Update French debconf template translation (thanks, Christian Perrier; | ||
2443 | closes: #194323). | ||
2444 | * Version the adduser dependency for --no-create-home (closes: #195756). | ||
2445 | * Add a version of moduli(5), namely revision 1.7 of | ||
2446 | http://www.openbsd.org/cgi-bin/cvsweb/src/share/man/man5/moduli.5 with | ||
2447 | '/etc/moduli' changed to '/etc/ssh/moduli' throughout (closes: #196061). | ||
2448 | |||
2449 | -- Colin Watson <cjwatson@debian.org> Mon, 9 Jun 2003 02:51:35 +0100 | ||
2450 | |||
2451 | openssh (1:3.6.1p2-2) unstable; urgency=low | ||
2452 | |||
2453 | * Force /etc/default/ssh to be non-executable, since dpkg apparently | ||
2454 | doesn't deal with permissions changes on conffiles (closes: #192966). | ||
2455 | * Use debconf 0.5's seen flag rather than the deprecated isdefault. | ||
2456 | * Add GPL location to copyright file. | ||
2457 | * Remove debian/postinst.old. | ||
2458 | * Switch to po-debconf, with some careful manual use of po2debconf to | ||
2459 | ensure that the source package continues to build smoothly on woody | ||
2460 | (closes: #183986). | ||
2461 | * Update debconf template translations: | ||
2462 | - Brazilian Portugese (thanks, Andre Luis Lopes; see #183986). | ||
2463 | - Japanese (thanks, Tomohiro KUBOTA; closes: #192429). | ||
2464 | * Compile with -fno-builtin-log for now, otherwise gcc-3.3 complains | ||
2465 | "log.h:59: warning: conflicting types for built-in function `log'". The | ||
2466 | OpenSSH log() function has been renamed in upstream CVS. | ||
2467 | |||
2468 | -- Colin Watson <cjwatson@debian.org> Mon, 19 May 2003 01:52:38 +0100 | ||
2469 | |||
2470 | openssh (1:3.6.1p2-1) unstable; urgency=medium | ||
2471 | |||
2472 | * New upstream release, including fix for PAM user-discovery security hole | ||
2473 | (closes: #191681). | ||
2474 | * Fix ChallengeResponseAuthentication default in generated sshd_config | ||
2475 | (closes: #106037). | ||
2476 | * Put newlines after full stops in man page documentation for | ||
2477 | ProtocolKeepAlives and SetupTimeOut. | ||
2478 | * Policy version 3.5.9: support DEB_BUILD_OPTIONS=noopt, build | ||
2479 | gnome-ssh-askpass with -g and -Wall flags. | ||
2480 | * Really ask ssh/new_config debconf question before trying to fetch its | ||
2481 | value (closes: #188721). | ||
2482 | * On purge, remove only the files we know about in /etc/ssh rather than | ||
2483 | the whole thing, and remove the directory if that leaves it empty | ||
2484 | (closes: #176679). | ||
2485 | * ssh has depended on debconf for some time now with no complaints, so: | ||
2486 | - Simplify the postinst by relying on debconf being present. (The absent | ||
2487 | case was buggy anyway.) | ||
2488 | - Get rid of "if you have not installed debconf" text in README.Debian, | ||
2489 | and generally update the "/usr/bin/ssh not SUID" entry. | ||
2490 | * More README.Debian work: | ||
2491 | - Reorganize into "UPGRADE ISSUES" and "OTHER ISSUES", in an effort to | ||
2492 | make it easier for people to find the former. The upgrade issues | ||
2493 | should probably be sorted by version somehow. | ||
2494 | - Document X11UseLocalhost under "X11 Forwarding" (closes: #150913). | ||
2495 | * Fix setting of IP flags for interactive sessions (upstream bug #541). | ||
2496 | |||
2497 | -- Colin Watson <cjwatson@debian.org> Mon, 5 May 2003 17:47:40 +0100 | ||
2498 | |||
2499 | openssh (1:3.6.1p1-1) unstable; urgency=low | ||
2500 | |||
2501 | * New upstream release (thanks, Laurence J. Lane). | ||
2502 | * debian/control: ssh-askpass-gnome is now Section: gnome, following the | ||
2503 | override file. | ||
2504 | |||
2505 | -- Colin Watson <cjwatson@debian.org> Wed, 2 Apr 2003 00:51:02 +0100 | ||
2506 | |||
2507 | openssh (1:3.6p1-1) unstable; urgency=low | ||
2508 | |||
2509 | * New upstream release. | ||
2510 | - Workaround applied upstream for a bug in the interaction of glibc's | ||
2511 | getaddrinfo() with the Linux 2.2 kernel (closes: #155814). | ||
2512 | - As such, it should now be safe to remove --with-ipv4-default, so | ||
2513 | starting sshd with -6 is no longer necessary (closes: #79861 and lots | ||
2514 | of other merged bugs). | ||
2515 | - ssh-copy-id prints usage when run without arguments (closes: #71376). | ||
2516 | - scp exits 1 if ssh fails (closes: #138400). | ||
2517 | - sshd writes to utmp's ut_addr_v6 field in IPv6 mode (closes: #167867). | ||
2518 | - 'ssh-add -c' causes ssh-agent to ask the user each time a key is used | ||
2519 | (closes: #109795). | ||
2520 | * Install /etc/default/ssh non-executable (closes: #185537). | ||
2521 | |||
2522 | -- Colin Watson <cjwatson@debian.org> Mon, 31 Mar 2003 23:00:59 +0100 | ||
2523 | |||
2524 | openssh (1:3.5p1-5) unstable; urgency=low | ||
2525 | |||
2526 | * Add /etc/default/ssh (closes: #161049). | ||
2527 | * Run the init script under 'set -e' (closes: #175010). | ||
2528 | * Change the default superuser path to include /sbin, /usr/sbin, and | ||
2529 | /usr/local/sbin (closes: #128235, #151267). Using login.defs would be | ||
2530 | nice, but that belongs to another package. Without a defined API to | ||
2531 | retrieve its settings, parsing it is off-limits. | ||
2532 | * Build ssh-askpass-gnome with GNOME 2. The source package should still | ||
2533 | support building on stable with GNOME 1, using the alternate | ||
2534 | libgnome-dev build-dependency (thanks, Colin Walters; closes: #167582). | ||
2535 | |||
2536 | -- Colin Watson <cjwatson@debian.org> Sun, 9 Mar 2003 20:12:10 +0000 | ||
2537 | |||
2538 | openssh (1:3.5p1-4) unstable; urgency=low | ||
2539 | |||
2540 | * Point rlogin and rcp alternatives at slogin and scp respectively rather | ||
2541 | than ssh (closes: #121103, #151666). Fix alternative removal to match; | ||
2542 | previously it was completely wrong anyway. | ||
2543 | * Find out whether /etc/ssh/sshd_not_to_be_run exists and set the debconf | ||
2544 | question's default using that information, rather than using debconf as | ||
2545 | a registry. Other solutions may be better in the long run, but this is | ||
2546 | at least correct (thanks, Matthew Woodcraft; closes: #84725). | ||
2547 | * Stop using pam_lastlog, as it doesn't currently work well as a session | ||
2548 | module when privilege separation is enabled; it can usually read | ||
2549 | /var/log/lastlog but can't write to it. Instead, just use sshd's | ||
2550 | built-in support, already enabled by default (closes: #151297, #169938). | ||
2551 | * Use 'ssh-keygen -q' rather than redirecting output to /dev/null. | ||
2552 | * Add a "this may take some time" warning when creating host keys on | ||
2553 | installation (part of #110094). | ||
2554 | * When restarting via the init script, check for sshd_not_to_be_run after | ||
2555 | stopping sshd (idea from Tomas Pospisek; closes: #149850). | ||
2556 | * Append /usr/sbin:/sbin to the init script's $PATH, just in case of | ||
2557 | strangeness (closes: #115138). | ||
2558 | * Fix a dpkg-statoverride call to redirect stdout to /dev/null, not | ||
2559 | stderr. | ||
2560 | * Correct copyright file typo: "orignal" -> "original" (closes: #176490). | ||
2561 | * Rebuild with libssl0.9.7 (closes: #176983). | ||
2562 | * We're up to policy version 3.5.6. DEB_BUILD_OPTIONS stuff still needs to | ||
2563 | be looked at. | ||
2564 | |||
2565 | -- Colin Watson <cjwatson@debian.org> Sat, 18 Jan 2003 01:37:23 +0000 | ||
2566 | |||
2567 | openssh (1:3.5p1-3) unstable; urgency=low | ||
2568 | |||
2569 | * Happy new year! | ||
2570 | * Use getent rather than id to find out whether the sshd user exists | ||
2571 | (closes: #150974). | ||
2572 | * Remove some duplication from the postinst's ssh-keysign setuid code. | ||
2573 | * Replace db_text with db_input throughout debian/config. (db_text has | ||
2574 | been a compatibility wrapper since debconf 0.1.5.) | ||
2575 | * Warn about PermitUserEnvironment on upgrade (closes: #167895). | ||
2576 | * Use 'make install-nokeys', and disable unused debhelper commands, | ||
2577 | thereby forward-porting the last pieces of Zack Weinberg's patch | ||
2578 | (closes: #68341). | ||
2579 | * Move the man page for gnome-ssh-askpass from the ssh package to | ||
2580 | ssh-askpass-gnome (closes: #174449). | ||
2581 | * Build with -DLOGIN_NO_ENDOPT, since Debian's /bin/login doesn't accept | ||
2582 | '--' to terminate the list of options (closes: #171554). | ||
2583 | * Add Jonathan Amery's ssh-argv0 script (closes: #111341). | ||
2584 | * Update Danish debconf template (thanks, Morten Brix Pedersen; | ||
2585 | closes: #174757). | ||
2586 | * Document setgid ssh-agent's effect on certain environment variables in | ||
2587 | README.Debian (closes: #167974). | ||
2588 | * Document interoperability problems between scp and ssh.com's server in | ||
2589 | README.Debian, and suggest some workarounds (closes: #174662). | ||
2590 | |||
2591 | -- Colin Watson <cjwatson@debian.org> Wed, 1 Jan 2003 14:18:30 +0000 | ||
2592 | |||
2593 | openssh (1:3.5p1-2) unstable; urgency=low | ||
2594 | |||
2595 | * Mention in the ssh package description that it provides both ssh and | ||
2596 | sshd (closes: #99680). | ||
2597 | * Create a system group for ssh-agent, not a user group (closes: #167669). | ||
2598 | |||
2599 | -- Colin Watson <cjwatson@debian.org> Mon, 4 Nov 2002 13:43:53 +0000 | ||
2600 | |||
2601 | openssh (1:3.5p1-1) unstable; urgency=low | ||
2602 | |||
2603 | * New upstream release. | ||
2604 | - Fixes typo in ssh-add usage (closes: #152239). | ||
2605 | - Fixes 'PermitRootLogin forced-commands-only' (closes: #166184). | ||
2606 | - ~/.ssh/environment and environment= options in ~/.ssh/authorized_keys | ||
2607 | are deprecated for security reasons and will eventually go away. For | ||
2608 | now they can be re-enabled by setting 'PermitUserEnvironment yes' in | ||
2609 | sshd_config. | ||
2610 | - ssh-agent is installed setgid to prevent ptrace() attacks. The group | ||
2611 | actually doesn't matter, as it drops privileges immediately, but to | ||
2612 | avoid confusion the postinst creates a new 'ssh' group for it. | ||
2613 | * Obsolete patches: | ||
2614 | - Solar Designer's privsep+compression patch for Linux 2.2 (see | ||
2615 | 1:3.3p1-0.0woody1). | ||
2616 | - Hostbased auth ssh-keysign backport (see 1:3.4p1-4). | ||
2617 | |||
2618 | * Remove duplicated phrase in ssh_config(5) (closes: #152404). | ||
2619 | * Source the debconf confmodule at the top of the postrm rather than at | ||
2620 | the bottom, to avoid making future non-idempotency problems worse (see | ||
2621 | #151035). | ||
2622 | * Debconf templates: | ||
2623 | - Add Polish (thanks, Grzegorz Kusnierz). | ||
2624 | - Update French (thanks, Denis Barbier; closes: #132509). | ||
2625 | - Update Spanish (thanks, Carlos Valdivia Yagüe; closes: #164716). | ||
2626 | * Write a man page for gnome-ssh-askpass, and link it to ssh-askpass.1 if | ||
2627 | this is the selected ssh-askpass alternative (closes: #67775). | ||
2628 | |||
2629 | -- Colin Watson <cjwatson@debian.org> Sat, 26 Oct 2002 19:41:51 +0100 | ||
2630 | |||
2631 | openssh (1:3.4p1-4) unstable; urgency=low | ||
2632 | |||
2633 | * Allow ssh-krb5 in ssh-askpass-gnome's dependencies (closes: #129532). | ||
2634 | * Restore Russia to list of countries where encryption is problematic (see | ||
2635 | #148951 and http://www.average.org/freecrypto/). | ||
2636 | * Drop ssh-askpass-gnome's priority to optional, per the override file. | ||
2637 | * Drop the PAM special case for hurd-i386 (closes: #99157). | ||
2638 | * s/dile/idle/ in ssh_config(5) (closes: #118331). | ||
2639 | * Note in README.Debian that you need xauth from xbase-clients on the | ||
2640 | server for X11 forwarding (closes: #140269). | ||
2641 | * Use correct path to upstream README in copyright file (closes: #146037). | ||
2642 | * Document the units for ProtocolKeepAlives (closes: #159479). | ||
2643 | * Backport upstream patch to fix hostbased auth (closes: #117114). | ||
2644 | * Add -g to CFLAGS. | ||
2645 | |||
2646 | -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 18:58:53 +0100 | ||
2647 | |||
2648 | openssh (1:3.4p1-3) unstable; urgency=low | ||
2649 | |||
2650 | * Add myself to Uploaders: and begin acting as temporary maintainer, at | ||
2651 | Matthew's request. (Normal service will resume in some months' time.) | ||
2652 | * Add sharutils to Build-Depends (closes: #138465). | ||
2653 | * Stop creating the /usr/doc/ssh symlink. | ||
2654 | |||
2655 | * Fix some debconf template typos (closes: #160358). | ||
2656 | * Split debconf templates into one file per language. | ||
2657 | * Add debconf template translations: | ||
2658 | - Brazilian Portuguese (thanks, Andre Luis Lopes; closes: #106173). | ||
2659 | - Danish (thanks, Claus Hindsgaul; closes: #126607). | ||
2660 | - Japanese (thanks, Tomohiro KUBOTA; closes: #137427). | ||
2661 | - Russian (thanks, Ilgiz Kalmetev; closes: #136610). | ||
2662 | - Spanish (thanks, Carlos Valdivia Yagüe; closes: #129041). | ||
2663 | * Update debconf template translations: | ||
2664 | - French (thanks, Igor Genibel; closes: #151361). | ||
2665 | - German (thanks, Axel Noetzold; closes: #147069). | ||
2666 | * Some of these translations are fuzzy. Please send updates. | ||
2667 | |||
2668 | -- Colin Watson <cjwatson@debian.org> Sun, 13 Oct 2002 14:09:57 +0100 | ||
2669 | |||
2670 | openssh (1:3.4p1-2) unstable; urgency=high | ||
2671 | |||
2672 | * Get a security-fixed version into unstable | ||
2673 | * Also tidy README.Debian up a little | ||
2674 | |||
2675 | -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 17:20:59 +0100 | ||
2676 | |||
2677 | openssh (1:3.4p1-1) testing; urgency=high | ||
2678 | |||
2679 | * Extend my tendrils back into this package (Closes: #150915, #151098) | ||
2680 | * thanks to the security team for their work | ||
2681 | * no thanks to ISS/Theo de Raadt for their handling of these bugs | ||
2682 | * save old sshd_configs to sshd_config.dpkg-old when auto-generating a | ||
2683 | new one | ||
2684 | * tell/ask the user about PriviledgeSeparation | ||
2685 | * /etc/init.d/ssh run will now create the chroot empty dir if necessary | ||
2686 | * Remove our previous statoverride on /usr/bin/ssh (only for people | ||
2687 | upgrading from a version where we'd put one in ourselves!) | ||
2688 | * Stop slandering Russia, since someone asked so nicely (Closes: #148951) | ||
2689 | * Reduce the sleep time in /etc/init.d/ssh during a restart | ||
2690 | |||
2691 | -- Matthew Vernon <matthew@debian.org> Fri, 28 Jun 2002 15:52:10 +0100 | ||
2692 | |||
2693 | openssh (1:3.4p1-0.0woody1) testing-security; urgency=high | ||
2694 | |||
2695 | * NMU by the security team. | ||
2696 | * New upstream version | ||
2697 | |||
2698 | -- Michael Stone <mstone@debian.org> Wed, 26 Jun 2002 15:40:38 -0400 | ||
2699 | |||
2700 | openssh (1:3.3p1-0.0woody4) testing-security; urgency=high | ||
2701 | |||
2702 | * NMU by the security team. | ||
2703 | * fix error when /etc/ssh/sshd_config exists on new install | ||
2704 | * check that user doesn't exist before running adduser | ||
2705 | * use openssl internal random unconditionally | ||
2706 | |||
2707 | -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 19:44:39 -0400 | ||
2708 | |||
2709 | openssh (1:3.3p1-0.0woody3) testing-security; urgency=high | ||
2710 | |||
2711 | * NMU by the security team. | ||
2712 | * use correct home directory when sshd user is created | ||
2713 | |||
2714 | -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400 | ||
2715 | |||
2716 | openssh (1:3.3p1-0.0woody2) testing-security; urgency=high | ||
2717 | |||
2718 | * NMU by the security team. | ||
2719 | * Fix rsa1 key creation (Closes: #150949) | ||
2720 | * don't fail if sshd user removal fails | ||
2721 | * depends: on adduser (Closes: #150907) | ||
2722 | |||
2723 | -- Michael Stone <mstone@debian.org> Tue, 25 Jun 2002 08:59:50 -0400 | ||
2724 | |||
2725 | openssh (1:3.3p1-0.0woody1) testing-security; urgency=high | ||
2726 | |||
2727 | * NMU by the security team. | ||
2728 | * New upstream version. | ||
2729 | - Enable privilege separation by default. | ||
2730 | * Include patch from Solar Designer for privilege separation and | ||
2731 | compression on 2.2.x kernels. | ||
2732 | * Remove --disable-suid-ssh from configure. | ||
2733 | * Support setuid ssh-keysign binary instead of setuid ssh client. | ||
2734 | * Check sshd configuration before restarting. | ||
2735 | |||
2736 | -- Daniel Jacobowitz <dan@debian.org> Mon, 24 Jun 2002 13:43:44 -0400 | ||
2737 | |||
2738 | openssh (1:3.0.2p1-9) unstable; urgency=high | ||
2739 | |||
2740 | * Thanks to those who NMUd | ||
2741 | * The only change in this version is to debian/control - I've removed | ||
2742 | the bit that says you can't export it from the US - it would look | ||
2743 | pretty daft to say this about a package in main! Also, it's now OK | ||
2744 | to use crypto in France, so I've edited that comment slightly | ||
2745 | * Correct a path in README.Debian too (Closes: #138634) | ||
2746 | |||
2747 | -- Matthew Vernon <matthew@debian.org> Sun, 4 Apr 2002 09:52:59 +0100 | ||
2748 | |||
2749 | openssh (1:3.0.2p1-8.3) unstable; urgency=medium | ||
2750 | |||
2751 | * NMU | ||
2752 | * Really set urgency to medium this time (oops) | ||
2753 | * Fix priority to standard per override while I'm at it | ||
2754 | |||
2755 | -- Aaron M. Ucko <ucko@debian.org> Sun, 24 Mar 2002 09:00:08 -0500 | ||
2756 | |||
2757 | openssh (1:3.0.2p1-8.2) unstable; urgency=low | ||
2758 | |||
2759 | * NMU with maintainer's permission | ||
2760 | * Prepare for upcoming ssh-nonfree transitional packages per | ||
2761 | <http://lists.debian.org/debian-ssh/2002/debian-ssh-200203/msg00008.html> | ||
2762 | * Urgency medium because it would really be good to get this into woody | ||
2763 | before it releases | ||
2764 | * Fix sections to match override file | ||
2765 | * Reissued due to clash with non-US -> main move | ||
2766 | |||
2767 | -- Aaron M. Ucko <ucko@debian.org> Sat, 23 Mar 2002 21:21:52 -0500 | ||
2768 | |||
2769 | openssh (1:3.0.2p1-8.1) unstable; urgency=low | ||
2770 | |||
2771 | * NMU | ||
2772 | * Move from non-US to mani | ||
2773 | |||
2774 | -- LaMont Jones <lamont@debian.org> Thu, 21 Mar 2002 09:33:50 -0700 | ||
2775 | |||
2776 | openssh (1:3.0.2p1-8) unstable; urgency=critical | ||
2777 | |||
2778 | * Security fix - patch from upstream (Closes: #137209, #137210) | ||
2779 | * Undo the changes in the unreleased -7, since they appear to break | ||
2780 | things here. Accordingly, the code change is minimal, and I'm | ||
2781 | happy to get it into testing ASAP | ||
2782 | |||
2783 | -- Matthew Vernon <matthew@debian.org> Thu, 7 Mar 2002 14:25:23 +0000 | ||
2784 | |||
2785 | openssh (1:3.0.2p1-7) unstable; urgency=high | ||
2786 | |||
2787 | * Build to support IPv6 and IPv4 by default again | ||
2788 | |||
2789 | -- Matthew Vernon <matthew@debian.org> Sat, 2 Mar 2002 00:25:05 +0000 | ||
2790 | |||
2791 | openssh (1:3.0.2p1-6) unstable; urgency=high | ||
2792 | |||
2793 | * Correct error in the clean target (Closes: #130868) | ||
2794 | |||
2795 | -- Matthew Vernon <matthew@debian.org> Sat, 26 Jan 2002 00:32:00 +0000 | ||
2796 | |||
2797 | openssh (1:3.0.2p1-5) unstable; urgency=medium | ||
2798 | |||
2799 | * Include the Debian version in our identification, to make it easier to | ||
2800 | audit networks for patched versions in future | ||
2801 | |||
2802 | -- Matthew Vernon <matthew@debian.org> Mon, 21 Jan 2002 17:16:10 +0000 | ||
2803 | |||
2804 | openssh (1:3.0.2p1-4) unstable; urgency=medium | ||
2805 | |||
2806 | * If we're asked to not run sshd, stop any running sshd's first | ||
2807 | (Closes: #129327) | ||
2808 | |||
2809 | -- Matthew Vernon <matthew@debian.org> Wed, 16 Jan 2002 21:24:16 +0000 | ||
2810 | |||
2811 | openssh (1:3.0.2p1-3) unstable; urgency=high | ||
2812 | |||
2813 | * Fix /etc/pam.d/ssh to not set $MAIL (Closes: #128913) | ||
2814 | * Remove extra debconf suggestion (Closes: #128094) | ||
2815 | * Mmm. speedy bug-fixing :-) | ||
2816 | |||
2817 | -- Matthew Vernon <matthew@debian.org> Sat, 12 Jan 2002 17:23:58 +0000 | ||
2818 | |||
2819 | openssh (1:3.0.2p1-2) unstable; urgency=high | ||
2820 | |||
2821 | * Fix postinst to not automatically overwrite sshd_config (!) | ||
2822 | (Closes: #127842, #127867) | ||
2823 | * Add section in README.Debian about the PermitRootLogin setting | ||
2824 | |||
2825 | -- Matthew Vernon <matthew@debian.org> Sat, 5 Jan 2003 05:26:30 +0000 | ||
2826 | |||
2827 | openssh (1:3.0.2p1-1) unstable; urgency=high | ||
2828 | |||
2829 | * Incorporate fix from Colin's NMU | ||
2830 | * New upstream version (fixes the bug Wichert fixed) (Closes: #124035) | ||
2831 | * Capitalise IETF (Closes: #125379) | ||
2832 | * Refer to the correct sftp-server location (Closes: #126854, #126224) | ||
2833 | * Do what we're asked re SetUID ssh (Closes: #124065, #124154, #123247) | ||
2834 | * Ask people upgrading from potato if they want a new conffile | ||
2835 | (Closes: #125642) | ||
2836 | * Fix a typo in postinst (Closes: #122192, #122410, #123440) | ||
2837 | * Frob the default config a little (Closes: #122284, #125827, #125696, | ||
2838 | #123854) | ||
2839 | * Make /etc/init.d/ssh be more clear about ssh not running (Closes: | ||
2840 | #123552) | ||
2841 | * Fix typo in templates file (Closes: #123411) | ||
2842 | |||
2843 | -- Matthew Vernon <matthew@debian.org> Fri, 4 Jan 2002 16:01:52 +0000 | ||
2844 | |||
2845 | openssh (1:3.0.1p1-1.2) unstable; urgency=high | ||
2846 | |||
2847 | * Non-maintainer upload | ||
2848 | * Prevent local users from passing environment variables to the login | ||
2849 | process when UseLogin is enabled | ||
2850 | |||
2851 | -- Wichert Akkerman <wakkerma@debian.org> Mon, 3 Dec 2001 19:34:45 +0100 | ||
2852 | |||
2853 | openssh (1:3.0.1p1-1.1) unstable; urgency=low | ||
2854 | |||
2855 | * Non-maintainer upload, at Matthew's request. | ||
2856 | * Remove sa_restorer assignment to fix compilation on alpha, hppa, and | ||
2857 | ia64 (closes: #122086). | ||
2858 | |||
2859 | -- Colin Watson <cjwatson@debian.org> Sun, 2 Dec 2001 18:54:16 +0000 | ||
2860 | |||
2861 | openssh (1:3.0.1p1-1) unstable; urgency=high | ||
2862 | |||
2863 | * New upstream version (Closes: #113646, #113513, #114707, #118564) | ||
2864 | * Building with a libc that works (!) (Closes: #115228) | ||
2865 | * Patches forward-ported are -1/-2 options for scp, the improvement to | ||
2866 | 'waiting for forwarded connections to terminate...' | ||
2867 | * Fix /etc/init.d/ssh to stop sshd properly (Closes: #115228) | ||
2868 | * /etc/ssh/sshd_config is no longer a conffile but generated in the postinst | ||
2869 | * Remove suidregister leftover from postrm | ||
2870 | * Mention key we are making in the postinst | ||
2871 | * Default to not enable SSH protocol 1 support, since protocol 2 is | ||
2872 | much safer anyway. | ||
2873 | * New version of the vpn-fixes patch, from Ian Jackson | ||
2874 | * New handling of -q, and added new -qq option; thanks to Jon Amery | ||
2875 | * Experimental smartcard support not enabled, since I have no way of | ||
2876 | testing it. | ||
2877 | |||
2878 | -- Matthew Vernon <matthew@debian.org> Thu, 28 Nov 2001 17:43:01 +0000 | ||
2879 | |||
2880 | openssh (1:2.9p2-6) unstable; urgency=low | ||
2881 | |||
2882 | * check for correct file in /etc/init.d/ssh (Closes: #110876) | ||
2883 | * correct location of version 2 keys in ssh.1 (Closes: #110439) | ||
2884 | * call update-alternatives --quiet (Closes: #103314) | ||
2885 | * hack ssh-copy-id to chmod go-w (Closes: #95551) | ||
2886 | * TEMPORARY fix to provide largefile support using a -D in the cflags | ||
2887 | line. long-term, upstream will patch the autoconf stuff | ||
2888 | (Closes: #106809, #111849) | ||
2889 | * remove /etc/rc references in ssh-keygen.1 (Closes: #68350) | ||
2890 | * scp.1 patch from Adam McKenna to document -r properly (Closes: #76054) | ||
2891 | * Check for files containing a newline character (Closes: #111692) | ||
2892 | |||
2893 | -- Matthew Vernon <matthew@debian.org> Thu, 13 Sep 2001 16:47:36 +0100 | ||
2894 | |||
2895 | openssh (1:2.9p2-5) unstable; urgency=high | ||
2896 | |||
2897 | * Thanks to all the bug-fixers who helped! | ||
2898 | * remove sa_restorer assignment (Closes: #102837) | ||
2899 | * patch from Peter Benie to DTRT wrt X forwarding if the server refuses | ||
2900 | us access (Closes: #48297) | ||
2901 | * patch from upstream CVS to fix port forwarding (Closes: #107132) | ||
2902 | * patch from Jonathan Amery to document ssh-keygen behaviour | ||
2903 | (Closes:#106643, #107512) | ||
2904 | * patch to postinst from Jonathan Amery (Closes: #106411) | ||
2905 | * patch to manpage from Jonathan Amery (Closes: #107364) | ||
2906 | * patch from Matthew Vernon to make -q emit fatal errors as that is the | ||
2907 | documented behaviour (Closes: #64347) | ||
2908 | * patch from Ian Jackson to cause us to destroy a file when we scp it | ||
2909 | onto itself, rather than dumping bits of our memory into it, which was | ||
2910 | a security hole (see #51955) | ||
2911 | * patch from Jonathan Amery to document lack of Kerberos support | ||
2912 | (Closes: #103726) | ||
2913 | * patch from Matthew Vernon to make the 'waiting for connections to | ||
2914 | terminate' message more helpful (Closes: #50308) | ||
2915 | |||
2916 | -- Matthew Vernon <matthew@debian.org> Thu, 23 Aug 2001 02:14:09 +0100 | ||
2917 | |||
2918 | openssh (1:2.9p2-4) unstable; urgency=high | ||
2919 | |||
2920 | * Today's build of ssh is strawberry flavoured | ||
2921 | * Patch from mhp to reduce length of time sshd is stopped for (Closes: #106176) | ||
2922 | * Tidy up debconf template (Closes: #106152) | ||
2923 | * If called non-setuid, then setgid()'s failure should not be fatal (see | ||
2924 | #105854) | ||
2925 | |||
2926 | -- Matthew Vernon <matthew@debian.org> Sun, 22 Jul 2001 14:19:43 +0100 | ||
2927 | |||
2928 | openssh (1:2.9p2-3) unstable; urgency=low | ||
2929 | |||
2930 | * Patch from yours truly to add -1 and -2 options to scp (Closes: #106061) | ||
2931 | * Improve the IdentityFile section in the man page (Closes: #106038) | ||
2932 | |||
2933 | -- Matthew Vernon <matthew@debian.org> Sat, 21 Jul 2001 14:47:27 +0100 | ||
2934 | |||
2935 | openssh (1:2.9p2-2) unstable; urgency=low | ||
2936 | |||
2937 | * Document the protocol version 2 and IPV6 changes (Closes: #105845, #105868) | ||
2938 | * Make PrintLastLog 'no' by default (Closes: #105893) | ||
2939 | |||
2940 | -- Matthew Vernon <matthew@debian.org> Thu, 19 Jul 2001 18:36:41 +0100 | ||
2941 | |||
2942 | openssh (1:2.9p2-1) unstable; urgency=low | ||
2943 | |||
2944 | * new (several..) upstream version (Closes: #96726, #81856, #96335) | ||
2945 | * Hopefully, this will close some other bugs too | ||
2946 | |||
2947 | -- Matthew Vernon <matthew@debian.org> Tue, 17 Jul 2001 19:41:58 +0100 | ||
2948 | |||
2949 | openssh (1:2.5.2p2-3) unstable; urgency=low | ||
2950 | |||
2951 | * Taking Over this package | ||
2952 | * Patches from Robert Bihlmeyer for the Hurd (Closes: #102991) | ||
2953 | * Put PermitRootLogin back to yes (Closes: #67334, #67371, #78274) | ||
2954 | * Don't fiddle with conf-files any more (Closes: #69501) | ||
2955 | |||
2956 | -- Matthew Vernon <matthew@debian.org> Tue, 03 Jul 2001 02:58:13 +0100 | ||
2957 | |||
2958 | openssh (1:2.5.2p2-2.2) unstable; urgency=low | ||
2959 | |||
2960 | * NMU | ||
2961 | * Include Hurd compatibility patches from Robert Bihlmeyer (Closes: #76033) | ||
2962 | * Patch from Richard Kettlewell for protocolkeepalives (Closes: #99273) | ||
2963 | * Patch from Matthew Vernon for BannerTimeOut, batchmode, and | ||
2964 | documentation for protocolkeepalives. Makes ssh more generally useful | ||
2965 | for scripting uses (Closes: #82877, #99275) | ||
2966 | * Set a umask, so ourpidfile isn't world-writable (closes: #100012, | ||
2967 | #98286, #97391) | ||
2968 | |||
2969 | -- Matthew Vernon <matthew@debian.org> Thu, 28 Jun 2001 23:15:42 +0100 | ||
2970 | |||
2971 | openssh (1:2.5.2p2-2.1) unstable; urgency=low | ||
2972 | |||
2973 | * NMU | ||
2974 | * Remove duplicate Build-Depends for libssl096-dev and change it to | ||
2975 | depend on libssl-dev instaed. Also adding in virtual | real package | ||
2976 | style build-deps. (Closes: #93793, #75228) | ||
2977 | * Removing add-log entry (Closes: #79266) | ||
2978 | * This was a pam bug from a while back (Closes: #86908, #88457, #86843) | ||
2979 | * pam build-dep already exists (Closes: #93683) | ||
2980 | * libgnome-dev build-dep already exists (Closes: #93694) | ||
2981 | * No longer in non-free (Closes: #85401) | ||
2982 | * Adding in fr debconf translations (Closes: #83783) | ||
2983 | * Already suggests xbase-clients (Closes: #79741) | ||
2984 | * No need to suggest libpam-pwdb anymore (Closes: #81658) | ||
2985 | * Providing rsh-client (Closes: #79437) | ||
2986 | * hurd patch was already applied (Closes: #76033) | ||
2987 | * default set to no (Closes: #73682) | ||
2988 | * Adding in a suggests for dnsutils (Closes: #93265) | ||
2989 | * postinst bugs fixed (Closes: #88057, #88066, #88196, #88405, #88612) | ||
2990 | (Closes: #88774, #88196, #89556, #90123, #90228, #90833, #87814, #85465) | ||
2991 | * Adding in debconf dependency | ||
2992 | |||
2993 | -- Ivan E. Moore II <rkrusty@debian.org> Mon, 16 Apr 2001 14:11:04 +0100 | ||
2994 | |||
2995 | openssh (1:2.5.2p2-2) unstable; urgency=high | ||
2996 | |||
2997 | * disable the OpenSSL version check in entropy.c | ||
2998 | (closes: #93581, #93588, #93590, #93614, #93619, #93635, #93648) | ||
2999 | |||
3000 | -- Philip Hands <phil@uk.alcove.com> Wed, 11 Apr 2001 20:30:04 +0100 | ||
3001 | |||
3002 | openssh (1:2.5.2p2-1) unstable; urgency=low | ||
3003 | |||
3004 | * New upstream release | ||
3005 | * removed make-ssh-known-hosts, since ssh-keyscan does that job (closes: #86069, #87748) | ||
3006 | * fix double space indent in german templates (closes: #89493) | ||
3007 | * make postinst check for ssh_host_rsa_key | ||
3008 | * get rid of the last of the misguided debian/rules NMU debris :-/ | ||
3009 | |||
3010 | -- Philip Hands <phil@hands.com> Sat, 24 Mar 2001 20:59:33 +0000 | ||
3011 | |||
3012 | openssh (1:2.5.1p2-2) unstable; urgency=low | ||
3013 | |||
3014 | * rebuild with new debhelper (closes: #89558, #89536, #90225) | ||
3015 | * fix broken dpkg-statoverride test in postinst | ||
3016 | (closes: #89612, #90474, #90460, #89605) | ||
3017 | * NMU bug fixed but not closed in last upload (closes: #88206) | ||
3018 | |||
3019 | -- Philip Hands <phil@hands.com> Fri, 23 Mar 2001 16:11:33 +0000 | ||
3020 | |||
3021 | openssh (1:2.5.1p2-1) unstable; urgency=high | ||
3022 | |||
3023 | * New upstream release | ||
3024 | * fix typo in postinst (closes: #88110) | ||
3025 | * revert to setting PAM service name in debian/rules, backing out last | ||
3026 | NMU, which also (closes: #88101) | ||
3027 | * restore the pam lastlog/motd lines, lost during the NMUs, and sshd_config | ||
3028 | * restore printlastlog option patch | ||
3029 | * revert to using debhelper, which had been partially disabled in NMUs | ||
3030 | |||
3031 | -- Philip Hands <phil@hands.com> Tue, 13 Mar 2001 01:41:34 +0000 | ||
3032 | |||
3033 | openssh (1:2.5.1p1-1.8) unstable; urgency=high | ||
3034 | |||
3035 | * And now the old pam-bug s/sshd/ssh in ssh.c is also fixed | ||
3036 | |||
3037 | -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 19:48:01 +0100 | ||
3038 | |||
3039 | openssh (1:2.5.1p1-1.7) unstable; urgency=high | ||
3040 | |||
3041 | * And now we mark the correct binary as setuid, when a user requested | ||
3042 | to install it setuid. | ||
3043 | |||
3044 | -- Christian Kurz <shorty@debian.org> Thu, 1 Mar 2001 07:19:56 +0100 | ||
3045 | |||
3046 | openssh (1:2.5.1p1-1.6) unstable; urgency=high | ||
3047 | |||
3048 | * Fixes postinst to handle overrides that are already there. Damn, I | ||
3049 | should have noticed the bug earlier. | ||
3050 | |||
3051 | -- Christian Kurz <shorty@debian.org> Wed, 28 Feb 2001 22:35:00 +0100 | ||
3052 | |||
3053 | openssh (1:2.5.1p1-1.5) unstable; urgency=high | ||
3054 | |||
3055 | * Rebuild ssh with pam-support. | ||
3056 | |||
3057 | -- Christian Kurz <shorty@debian.org> Mon, 26 Feb 2001 21:55:51 +0100 | ||
3058 | |||
3059 | openssh (1:2.5.1p1-1.4) unstable; urgency=low | ||
3060 | |||
3061 | * Added Build-Depends on libssl096-dev. | ||
3062 | * Fixed sshd_config file to disallow root logins again. | ||
3063 | |||
3064 | -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 20:03:55 +0100 | ||
3065 | |||
3066 | openssh (1:2.5.1p1-1.3) unstable; urgency=low | ||
3067 | |||
3068 | * Fixed missing manpages for sftp.1 and ssh-keyscan.1 | ||
3069 | * Made package policy 3.5.2 compliant. | ||
3070 | |||
3071 | -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 15:46:26 +0100 | ||
3072 | |||
3073 | openssh (1:2.5.1p1-1.2) unstable; urgency=low | ||
3074 | |||
3075 | * Added Conflict with sftp, since we now provide our own sftp-client. | ||
3076 | * Added a fix for our broken dpkg-statoverride call in the | ||
3077 | 2.3.0p1-13. | ||
3078 | * Fixed some config pathes in the comments of sshd_config. | ||
3079 | * Removed ssh-key-exchange-vulnerability-patch since it's not needed | ||
3080 | anymore because upstream included the fix. | ||
3081 | |||
3082 | -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 13:46:58 +0100 | ||
3083 | |||
3084 | openssh (1:2.5.1p1-1.1) unstable; urgency=high | ||
3085 | |||
3086 | * Another NMU to get the new upstream version 2.5.1p1 into | ||
3087 | unstable. (Closes: #87123) | ||
3088 | * Corrected postinst to mark ssh as setuid. (Closes: #86391, #85766) | ||
3089 | * Key Exchange patch is already included by upstream. (Closes: #86015) | ||
3090 | * Upgrading should be possible now. (Closes: #85525, #85523) | ||
3091 | * Added --disable-suid-ssh as compile option, so ssh won't get installed | ||
3092 | suid per default. | ||
3093 | * Fixed postinst to run dpkg-statoverride only, when dpkg-statoverride | ||
3094 | is available and the mode of the binary should be 4755. And also added | ||
3095 | suggestion for a newer dpkg. | ||
3096 | (Closes: #85734, #85741, #86876) | ||
3097 | * sftp and ssh-keyscan will also be included from now on. (Closes: #79994) | ||
3098 | * scp now understands spaces in filenames (Closes: #53783, #58958, | ||
3099 | #66723) | ||
3100 | * ssh-keygen now supports showing DSA fingerprints. (Closes: #68623) | ||
3101 | * ssh doesn' t show motd anymore when switch -t is used. (Closes #69035) | ||
3102 | * ssh supports the usage of other dsa keys via the ssh command line | ||
3103 | options. (Closes: #81250) | ||
3104 | * Documentation in sshd_config fixed. (Closes: #81088) | ||
3105 | * primes file included by upstream and included now. (Closes: #82101) | ||
3106 | * scp now allows dots in the username. (Closes: #82477) | ||
3107 | * Spelling error in ssh-copy-id.1 corrected by upstream. (Closes: #78124) | ||
3108 | |||
3109 | -- Christian Kurz <shorty@debian.org> Sun, 25 Feb 2001 10:06:08 +0100 | ||
3110 | |||
3111 | openssh (1:2.3.0p1-1.13) unstable; urgency=low | ||
3112 | |||
3113 | * Config should now also be fixed with this hopefully last NMU. | ||
3114 | |||
3115 | -- Christian Kurz <shorty@debian.org> Sat, 10 Feb 2001 22:56:36 +0100 | ||
3116 | |||
3117 | openssh (1:2.3.0p1-1.12) unstable; urgency=high | ||
3118 | |||
3119 | * Added suggest for xbase-clients to control-file. (Closes #85227) | ||
3120 | * Applied patch from Markus Friedl to fix a vulnerability in | ||
3121 | the rsa keyexchange. | ||
3122 | * Fixed position of horizontal line. (Closes: #83613) | ||
3123 | * Fixed hopefully the grep problem in the config-file. (Closes: #78802) | ||
3124 | * Converted package from suidregister to dpkg-statoverride. | ||
3125 | |||
3126 | -- Christian Kurz <shorty@debian.org> Fri, 9 Feb 2001 19:43:55 +0100 | ||
3127 | |||
3128 | openssh (1:2.3.0p1-1.11) unstable; urgency=medium | ||
3129 | |||
3130 | * Fixed some typos in the german translation of the debconf | ||
3131 | template. | ||
3132 | |||
3133 | -- Christian Kurz <shorty@debian.org> Wed, 24 Jan 2001 18:22:38 +0100 | ||
3134 | |||
3135 | openssh (1:2.3.0p1-1.10) unstable; urgency=medium | ||
3136 | |||
3137 | * Fixed double printing of motd. (Closes: #82618) | ||
3138 | |||
3139 | -- Christian Kurz <shorty@debian.org> Tue, 23 Jan 2001 21:03:43 +0100 | ||
3140 | |||
3141 | openssh (1:2.3.0p1-1.9) unstable; urgency=high | ||
3142 | |||
3143 | * And the next NMU which includes the patch from Andrew Bartlett | ||
3144 | and Markus Friedl to fix the root privileges handling of openssh. | ||
3145 | (Closes: #82657) | ||
3146 | |||
3147 | -- Christian Kurz <shorty@debian.org> Wed, 17 Jan 2001 22:20:54 +0100 | ||
3148 | |||
3149 | openssh (1:2.3.0p1-1.8) unstable; urgency=high | ||
3150 | |||
3151 | * Applied fix from Ryan Murray to allow building on other architectures | ||
3152 | since the hurd patch was wrong. (Closes: #82471) | ||
3153 | |||
3154 | -- Christian Kurz <shorty@debian.org> Tue, 16 Jan 2001 22:45:51 +0100 | ||
3155 | |||
3156 | openssh (1:2.3.0p1-1.7) unstable; urgency=medium | ||
3157 | |||
3158 | * Fixed another typo on sshd_config | ||
3159 | |||
3160 | -- Christian Kurz <shorty@debian.org> Sun, 14 Jan 2001 19:01:31 +0100 | ||
3161 | |||
3162 | openssh (1:2.3.0p1-1.6) unstable; urgency=high | ||
3163 | |||
3164 | * Added Build-Dependency on groff (Closes: #81886) | ||
3165 | * Added Build-Depencency on debhelper (Closes: #82072) | ||
3166 | * Fixed entry for known_hosts in sshd_config (Closes: #82096) | ||
3167 | |||
3168 | -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 23:08:16 +0100 | ||
3169 | |||
3170 | openssh (1:2.3.0p1-1.5) unstable; urgency=high | ||
3171 | |||
3172 | * Fixed now also the problem with sshd used as default ipv4 and | ||
3173 | didn't use IPv6. This should be now fixed. | ||
3174 | |||
3175 | -- Christian Kurz <shorty@debian.org> Thu, 11 Jan 2001 21:25:55 +0100 | ||
3176 | |||
3177 | openssh (1:2.3.0p1-1.4) unstable; urgency=high | ||
3178 | |||
3179 | * Fixed buggy entry in postinst. | ||
3180 | |||
3181 | -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 23:12:16 +0100 | ||
3182 | |||
3183 | openssh (1:2.3.0p1-1.3) unstable; urgency=high | ||
3184 | |||
3185 | * After finishing the rewrite of the rules-file I had to notice that | ||
3186 | the manpage installation was broken. This should now work again. | ||
3187 | |||
3188 | -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 22:11:59 +0100 | ||
3189 | |||
3190 | openssh (1:2.3.0p1-1.2) unstable; urgency=high | ||
3191 | |||
3192 | * Fixed the screwed up build-dependency. | ||
3193 | * Removed --with-ipv4-default to support ipv6. | ||
3194 | * Changed makefile to use /etc/pam.d/ssh instead of /etc/pam.d/sshd. | ||
3195 | * Fixed location to sftp-server in config. | ||
3196 | * Since debian still relies on /etc/pam.d/ssh instead of moving to | ||
3197 | /etc/pam.d/sshd, I had to hack ssh.h to get ssh to use this name. | ||
3198 | * Fixed path to host key in sshd_config. | ||
3199 | |||
3200 | -- Christian Kurz <shorty@debian.org> Wed, 10 Jan 2001 08:23:47 +0100 | ||
3201 | |||
3202 | openssh (1:2.3.0p1-1.1) unstable; urgency=medium | ||
3203 | |||
3204 | * NMU with permission of Phil Hands. | ||
3205 | * New upstream release | ||
3206 | * Update Build-Depends to point to new libssl096. | ||
3207 | * This upstream release doesn't leak any information depending | ||
3208 | on the setting of PermitRootLogin (Closes: #59933) | ||
3209 | * New upstream release contains fix against forcing a client to | ||
3210 | do X/agent forwarding (Closes: #76788) | ||
3211 | * Changed template to contain correct path to the documentation | ||
3212 | (Closes: #67245) | ||
3213 | * Added --with-4in6 switch as compile option into debian/rules. | ||
3214 | * Added --with-ipv4-default as compile option into debian/rules. | ||
3215 | (Closes: #75037) | ||
3216 | * Changed default path to also contain /usr/local/bin and | ||
3217 | /usr/X11R6/bin (Closes: #62472,#54567,#62810) | ||
3218 | * Changed path to sftp-server in sshd_config to match the | ||
3219 | our package (Closes: #68347) | ||
3220 | * Replaced OpenBSDh with OpenBSD in the init-script. | ||
3221 | * Changed location to original source in copyright.head | ||
3222 | * Changed behaviour of init-script when invoked with the option | ||
3223 | restart (Closes: #68706,#72560) | ||
3224 | * Added a note about -L option of scp to README.Debian | ||
3225 | * ssh won't print now the motd if invoked with -t option | ||
3226 | (Closes: #59933) | ||
3227 | * RFC.nroff.gz get's now converted into RFC.gz. (Closes: #63867) | ||
3228 | * Added a note about tcp-wrapper support to README.Debian | ||
3229 | (Closes: #72807,#22190) | ||
3230 | * Removed two unneeded options from building process. | ||
3231 | * Added sshd.pam into debian dir and install it. | ||
3232 | * Commented out unnecessary call to dh_installinfo. | ||
3233 | * Added a line to sshd.pam so that limits will be paid attention | ||
3234 | to (Closes: #66904) | ||
3235 | * Restart Option has a Timeout of 10 seconds (Closes: 51264) | ||
3236 | * scp won't override files anymore (Closes: 51955) | ||
3237 | * Removed pam_lastlog module, so that the lastlog is now printed | ||
3238 | only once (Closes: #71742, #68335, #69592, #71495, #77781) | ||
3239 | * If password is expired, openssh now forces the user to change it. | ||
3240 | (Closes: #51747) | ||
3241 | * scp should now have no more problems with shell-init-files that | ||
3242 | produces ouput (Closes: #56280,#59873) | ||
3243 | * ssh now prints the motd correctly (Closes: #66926) | ||
3244 | * ssh upgrade should disable ssh daemon only if users has choosen | ||
3245 | to do so (Closes: #67478) | ||
3246 | * ssh can now be installed suid (Closes: #70879) | ||
3247 | * Modified debian/rules to support hurd. | ||
3248 | |||
3249 | -- Christian Kurz <shorty@debian.org> Wed, 27 Dec 2000 20:06:57 +0100 | ||
3250 | |||
3251 | openssh (1:2.2.0p1-1.1) unstable; urgency=medium | ||
3252 | |||
3253 | * Non-Maintainer Upload | ||
3254 | * Check for new returns in the new libc | ||
3255 | (closes: #72803, #74393, #72797, #71307, #71702) | ||
3256 | * Link against libssl095a (closes: #66304) | ||
3257 | * Correct check for PermitRootLogin (closes: #69448) | ||
3258 | |||
3259 | -- Ryan Murray <rmurray@debian.org> Wed, 18 Oct 2000 00:48:18 -0700 | ||
3260 | |||
3261 | openssh (1:2.2.0p1-1) unstable; urgency=low | ||
3262 | |||
3263 | * New upstream release | ||
3264 | |||
3265 | -- Philip Hands <phil@hands.com> Mon, 11 Sep 2000 14:49:43 +0100 | ||
3266 | |||
3267 | openssh (1:2.1.1p4-3) unstable; urgency=low | ||
3268 | |||
3269 | * add rsh alternatives | ||
3270 | * add -S option to scp (using Tommi Virtanen's patch) (closes: #63097) | ||
3271 | * do the IPV4_DEFAULT thing properly this time | ||
3272 | |||
3273 | -- Philip Hands <phil@hands.com> Fri, 11 Aug 2000 18:14:37 +0100 | ||
3274 | |||
3275 | openssh (1:2.1.1p4-2) unstable; urgency=low | ||
3276 | |||
3277 | * reinstate manpage .out patch from 1:1.2.3 | ||
3278 | * fix typo in postinst | ||
3279 | * only compile ssh with IPV4_DEFAULT | ||
3280 | * apply James Troup's patch to add a -o option to scp and updated manpage | ||
3281 | |||
3282 | -- Philip Hands <phil@hands.com> Sun, 30 Jul 2000 00:12:49 +0100 | ||
3283 | |||
3284 | openssh (1:2.1.1p4-1) unstable; urgency=low | ||
3285 | |||
3286 | * New upstream release | ||
3287 | |||
3288 | -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 14:46:16 +0100 | ||
3289 | |||
3290 | openssh (1:1.2.3-10) unstable; urgency=low | ||
3291 | |||
3292 | * add version to libpam-modules dependency, because old versions of | ||
3293 | pam_motd make it impossible to log in. | ||
3294 | |||
3295 | -- Philip Hands <phil@hands.com> Sat, 29 Jul 2000 13:28:22 +0100 | ||
3296 | |||
3297 | openssh (1:1.2.3-9) frozen unstable; urgency=low | ||
3298 | |||
3299 | * force location of /usr/bin/X11/xauth | ||
3300 | (closes: #64424, #66437, #66859) *RC* | ||
3301 | * typos in config (closes: #66779, #66780) | ||
3302 | * sshd_not_to_be_run could be assumed to be true, in error, if the config | ||
3303 | script died in an unusual way --- I've reversed this (closes: #66335) | ||
3304 | * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to ssh-askpass-ptk | ||
3305 | (closes: #65981) | ||
3306 | * change default for PermitRootLogin to "no" (closes: #66406) | ||
3307 | |||
3308 | -- Philip Hands <phil@hands.com> Tue, 11 Jul 2000 20:51:18 +0100 | ||
3309 | |||
3310 | openssh (1:1.2.3-8) frozen unstable; urgency=low | ||
3311 | |||
3312 | * get rid of Provides: rsh-server (this will mean that rstartd | ||
3313 | will need to change it's depends to deal with #63948, which I'm | ||
3314 | reopening) (closes: #66257) | ||
3315 | Given that this is also a trivial change, and is a reversal of a | ||
3316 | change that was mistakenly made after the freeze, I think this should | ||
3317 | also go into frozen. | ||
3318 | |||
3319 | -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:26:30 +0100 | ||
3320 | |||
3321 | openssh (1:1.2.3-7) frozen unstable; urgency=low | ||
3322 | |||
3323 | * check if debconf is installed before calling db_stop in postinst. | ||
3324 | This is required to allow ssh to be installed when debconf is not | ||
3325 | wanted, which probably makes it an RC upload (hopefully the last of | ||
3326 | too many). | ||
3327 | |||
3328 | -- Philip Hands <phil@hands.com> Wed, 28 Jun 2000 03:19:47 +0100 | ||
3329 | |||
3330 | openssh (1:1.2.3-6) frozen unstable; urgency=low | ||
3331 | |||
3332 | * fixed depressing little bug involving a line wrap looking like | ||
3333 | a blank line in the templates file *RC* | ||
3334 | (closes: #66090, #66078, #66083, #66182) | ||
3335 | |||
3336 | -- Philip Hands <phil@hands.com> Mon, 26 Jun 2000 00:45:05 +0100 | ||
3337 | |||
3338 | openssh (1:1.2.3-5) frozen unstable; urgency=low | ||
3339 | |||
3340 | * add code to prevent UseLogin exploit, although I think our PAM | ||
3341 | conditional code breaks UseLogin in a way that protects us from this | ||
3342 | exploit anyway. ;-) (closes: #65495) *RC* | ||
3343 | * Apply Zack Weinberg <zack@wolery.cumb.org>'s patch to fix keyboard | ||
3344 | grab vulnerability in ssh-askpass-gnome (closes: #64795) *RC* | ||
3345 | * stop redirection of sshd's file descriptors (introduced in 1:1.2.3-3) | ||
3346 | and use db_stop in the postinst to solve that problem instead | ||
3347 | (closes: #65104) | ||
3348 | * add Provides: rsh-server to ssh (closes: #63948) | ||
3349 | * provide config option not to run sshd | ||
3350 | |||
3351 | -- Philip Hands <phil@hands.com> Mon, 12 Jun 2000 23:05:11 +0100 | ||
3352 | |||
3353 | openssh (1:1.2.3-4) frozen unstable; urgency=low | ||
3354 | |||
3355 | * fixes #63436 which is *RC* | ||
3356 | * add 10 second pause in init.d restart (closes: #63844) | ||
3357 | * get rid of noenv in PAM mail line (closes: #63856) | ||
3358 | * fix host key path in make-ssh-known-hosts (closes: #63713) | ||
3359 | * change wording of SUID template (closes: #62788, #63436) | ||
3360 | |||
3361 | -- Philip Hands <phil@hands.com> Sat, 27 May 2000 11:18:06 +0100 | ||
3362 | |||
3363 | openssh (1:1.2.3-3) frozen unstable; urgency=low | ||
3364 | |||
3365 | * redirect sshd's file descriptors to /dev/null in init to | ||
3366 | prevent debconf from locking up during installation | ||
3367 | ** grave bug just submited by me ** | ||
3368 | |||
3369 | -- Philip Hands <phil@hands.com> Thu, 20 Apr 2000 17:10:59 +0100 | ||
3370 | |||
3371 | openssh (1:1.2.3-2) frozen unstable; urgency=low | ||
3372 | |||
3373 | * allow user to select SUID status of /usr/bin/ssh (closes: 62462) ** RC ** | ||
3374 | * suggest debconf | ||
3375 | * conflict with debconf{,-tiny} (<<0.2.17) so I can clean up the preinst | ||
3376 | |||
3377 | -- Philip Hands <phil@hands.com> Wed, 19 Apr 2000 17:49:15 +0100 | ||
3378 | |||
3379 | openssh (1:1.2.3-1) frozen unstable; urgency=low | ||
3380 | |||
3381 | * New upstream release | ||
3382 | * patch sshd to create extra xauth key required for localhost | ||
3383 | (closes: #49944) *** RC *** | ||
3384 | * FallbacktoRsh now defaults to ``no'' to match impression | ||
3385 | given in sshd_config | ||
3386 | * stop setting suid bit on ssh (closes: #58711, #58558) | ||
3387 | This breaks Rhosts authentication (which nobody uses) and allows | ||
3388 | the LD_PRELOAD trick to get socks working, so seems like a net benefit. | ||
3389 | |||
3390 | -- Philip Hands <phil@hands.com> Thu, 13 Apr 2000 20:01:54 +0100 | ||
3391 | |||
3392 | openssh (1:1.2.2-1.4) frozen unstable; urgency=low | ||
3393 | |||
3394 | * Recompile for frozen, contains fix for RC bug. | ||
3395 | |||
3396 | -- Tommi Virtanen <tv@debian.org> Tue, 29 Feb 2000 22:14:58 +0200 | ||
3397 | |||
3398 | openssh (1:1.2.2-1.3) unstable; urgency=low | ||
3399 | |||
3400 | * Integrated man page addition for PrintLastLog. | ||
3401 | This bug was filed on "openssh", and I ended up | ||
3402 | creating my own patch for this (closes: #59054) | ||
3403 | * Improved error message when ssh_exchange_identification | ||
3404 | gets EOF (closes: #58904) | ||
3405 | * Fixed typo (your -> you're) in debian/preinst. | ||
3406 | * Added else-clauses to config to make this upgradepath possible: | ||
3407 | oldssh -> openssh preinst fails due to upgrade_to_openssh=false | ||
3408 | -> ssh-nonfree -> openssh. Without these, debconf remembered | ||
3409 | the old answer, config didn't force asking it, and preinst always | ||
3410 | aborted (closes: #56596, #57782) | ||
3411 | * Moved setting upgrade_to_openssh isdefault flag to the place | ||
3412 | where preinst would abort. This means no double question to most | ||
3413 | users, people who currently suffer from "can't upgrade" may need | ||
3414 | to run apt-get install ssh twice. Did not do the same for | ||
3415 | use_old_init_script, as the situation is a bit different, and | ||
3416 | less common (closes: #54010, #56224) | ||
3417 | * Check for existance of ssh-keygen before attempting to use it in | ||
3418 | preinst, added warning for non-existant ssh-keygen in config. This | ||
3419 | happens when the old ssh is removed (say, due to ssh-nonfree getting | ||
3420 | installed). | ||
3421 | |||
3422 | -- Tommi Virtanen <tv@debian.org> Sun, 27 Feb 2000 21:36:43 +0200 | ||
3423 | |||
3424 | openssh (1:1.2.2-1.2) frozen unstable; urgency=low | ||
3425 | |||
3426 | * Non-maintainer upload. | ||
3427 | * Added configuration option PrintLastLog, default off due to PAM | ||
3428 | (closes: #54007, #55042) | ||
3429 | * ssh-askpass-{gnome,ptk} now provide ssh-askpass, making ssh's | ||
3430 | Suggests: line more accurate. Also closing related bugs fixed | ||
3431 | earlier, when default ssh-askpass moved to /usr/bin. | ||
3432 | (closes: #52403, #54741, #50607, #52298, #50967, #51661) | ||
3433 | * Patched to call vhangup, with autoconf detection and all | ||
3434 | (closes: #55379) | ||
3435 | * Added --with-ipv4-default workaround to a glibc bug causing | ||
3436 | slow DNS lookups, as per UPGRADING. Use -6 to really use | ||
3437 | IPv6 addresses. (closes: #57891, #58744, #58713, #57970) | ||
3438 | * Added noenv to PAM pam_mail line. Thanks to Ben Collins. | ||
3439 | (closes: #58429) | ||
3440 | * Added the UPGRADING file to the package. | ||
3441 | * Added frozen to the changelog line and recompiled before | ||
3442 | package was installed into the archive. | ||
3443 | |||
3444 | -- Tommi Virtanen <tv@debian.org> Fri, 25 Feb 2000 22:08:57 +0200 | ||
3445 | |||
3446 | openssh (1:1.2.2-1.1) frozen unstable; urgency=low | ||
3447 | |||
3448 | * Non-maintainer upload. | ||
3449 | * Integrated scp pipe buffer patch from Ben Collins | ||
3450 | <benc@debian.org>, should now work even if reading | ||
3451 | a pipe gives less than fstat st_blksize bytes. | ||
3452 | Should now work on Alpha and Sparc Linux (closes: #53697, #52071) | ||
3453 | * Made ssh depend on libssl09 (>= 0.9.4-3) (closes: #51393) | ||
3454 | * Integrated patch from Ben Collins <benc@debian.org> | ||
3455 | to do full shadow account locking and expiration | ||
3456 | checking (closes: #58165, #51747) | ||
3457 | |||
3458 | -- Tommi Virtanen <tv@debian.org> Tue, 22 Feb 2000 20:46:12 +0200 | ||
3459 | |||
3460 | openssh (1:1.2.2-1) frozen unstable; urgency=medium | ||
3461 | |||
3462 | * New upstream release (closes: #56870, #56346) | ||
3463 | * built against new libesd (closes: #56805) | ||
3464 | * add Colin Watson <cjw44@cam.ac.uk> =NULL patch | ||
3465 | (closes: #49902, #54894) | ||
3466 | * use socketpairs as suggested by Andrew Tridgell to eliminate rsync | ||
3467 | (and other) lockups | ||
3468 | * patch SSHD_PAM_SERVICE back into auth-pam.c, again :-/ | ||
3469 | (closes: #49902, #55872, #56959) | ||
3470 | * uncoment the * line in ssh_config (closes: #56444) | ||
3471 | |||
3472 | * #54894 & #49902 are release critical, so this should go in frozen | ||
3473 | |||
3474 | -- Philip Hands <phil@hands.com> Wed, 9 Feb 2000 04:52:04 +0000 | ||
3475 | |||
3476 | openssh (1:1.2.1pre24-1) unstable; urgency=low | ||
3477 | |||
3478 | * New upstream release | ||
3479 | |||
3480 | -- Philip Hands <phil@hands.com> Fri, 31 Dec 1999 02:47:24 +0000 | ||
3481 | |||
3482 | openssh (1:1.2.1pre23-1) unstable; urgency=low | ||
3483 | |||
3484 | * New upstream release | ||
3485 | * excape ? in /etc/init.d/ssh (closes: #53269) | ||
3486 | |||
3487 | -- Philip Hands <phil@hands.com> Wed, 29 Dec 1999 16:50:46 +0000 | ||
3488 | |||
3489 | openssh (1:1.2pre17-1) unstable; urgency=low | ||
3490 | |||
3491 | * New upstream release | ||
3492 | |||
3493 | -- Philip Hands <phil@hands.com> Thu, 9 Dec 1999 16:50:40 +0000 | ||
3494 | |||
3495 | openssh (1:1.2pre16-1) unstable; urgency=low | ||
3496 | |||
3497 | * New upstream release | ||
3498 | * upstream release (1.2pre14) (closes: #50299) | ||
3499 | * make ssh depend on libwrap0 (>= 7.6-1.1) (closes: #50973, #50776) | ||
3500 | * dispose of grep -q broken pipe message in config script (closes: #50855) | ||
3501 | * add make-ssh-known-hosts (closes: #50660) | ||
3502 | * add -i option to ssh-copy-id (closes: #50657) | ||
3503 | * add check for *LK* in password, indicating a locked account | ||
3504 | |||
3505 | -- Philip Hands <phil@hands.com> Wed, 8 Dec 1999 22:59:38 +0000 | ||
3506 | |||
3507 | openssh (1:1.2pre13-1) unstable; urgency=low | ||
3508 | |||
3509 | * New upstream release | ||
3510 | * make sshd.c use SSHD_PAM_SERVICE and define it as "ssh" in debian/rules | ||
3511 | * remove duplicate line in /etc/pam.d/ssh (closes: #50310) | ||
3512 | * mention ssh -A option in ssh.1 & ssh_config | ||
3513 | * enable forwarding to localhost in default ssh_config (closes: #50373) | ||
3514 | * tweak preinst to deal with debconf being `unpacked' | ||
3515 | * use --with-tcp-wrappers (closes: #49545) | ||
3516 | |||
3517 | -- Philip Hands <phil@hands.com> Sat, 20 Nov 1999 14:20:04 +0000 | ||
3518 | |||
3519 | openssh (1:1.2pre11-2) unstable; urgency=low | ||
3520 | |||
3521 | * oops, just realised that I forgot to strip out the unpleasant | ||
3522 | fiddling mentioned below (which turned not to be a fix anyway) | ||
3523 | |||
3524 | -- Philip Hands <phil@hands.com> Mon, 15 Nov 1999 01:35:23 +0000 | ||
3525 | |||
3526 | openssh (1:1.2pre11-1) unstable; urgency=low | ||
3527 | |||
3528 | * New upstream release (closes: #49722) | ||
3529 | * add 2>/dev/null to dispose of spurious message casused by grep -q | ||
3530 | (closes: #49876, #49604) | ||
3531 | * fix typo in debian/control (closes: #49841) | ||
3532 | * Do some unpleasant fiddling with upgraded keys in the preinst, which | ||
3533 | should make the keylength problem go away. (closes: #49676) | ||
3534 | * make pam_start in sshd use ``ssh'' as the service name (closes: #49956) | ||
3535 | * If /etc/ssh/NOSERVER exist, stop sshd from starting (closes: #47107) | ||
3536 | * apply Ben Collins <bcollins@debian.org>'s shadow patch | ||
3537 | * disable lastlogin and motd printing if using pam (closes: #49957) | ||
3538 | * add ssh-copy-id script and manpage | ||
3539 | |||
3540 | -- Philip Hands <phil@hands.com> Fri, 12 Nov 1999 01:03:38 +0000 | ||
3541 | |||
3542 | openssh (1:1.2pre9-1) unstable; urgency=low | ||
3543 | |||
3544 | * New upstream release | ||
3545 | * apply Chip Salzenberg <chip@valinux.com>'s SO_REUSEADDR patch | ||
3546 | to channels.c, to make forwarded ports instantly reusable | ||
3547 | * replace Pre-Depend: debconf with some check code in preinst | ||
3548 | * make the ssh-add ssh-askpass failure message more helpful | ||
3549 | * fix the ssh-agent getopts bug (closes: #49426) | ||
3550 | * fixed typo on Suggests: line (closes: #49704, #49571) | ||
3551 | * tidy up ssh package description (closes: #49642) | ||
3552 | * make ssh suid (closes: #49635) | ||
3553 | * in preinst upgrade code, ensure ssh_host_keys is mode 600 (closes: #49606) | ||
3554 | * disable agent forwarding by default, for the similar reasons as | ||
3555 | X forwarding (closes: #49586) | ||
3556 | |||
3557 | -- Philip Hands <phil@hands.com> Tue, 9 Nov 1999 09:57:47 +0000 | ||
3558 | |||
3559 | openssh (1:1.2pre7-4) unstable; urgency=low | ||
3560 | |||
3561 | * predepend on debconf (>= 0.2.17) should now allow preinst questions | ||
3562 | |||
3563 | -- Philip Hands <phil@hands.com> Sat, 6 Nov 1999 10:31:06 +0000 | ||
3564 | |||
3565 | openssh (1:1.2pre7-3) unstable; urgency=low | ||
3566 | |||
3567 | * add ssh-askpass package using Tommi Virtanen's perl-tk script | ||
3568 | * add ssh-preconfig package cludge | ||
3569 | * add usage hints to ssh-agent.1 | ||
3570 | |||
3571 | -- Philip Hands <phil@hands.com> Fri, 5 Nov 1999 00:38:33 +0000 | ||
3572 | |||
3573 | openssh (1:1.2pre7-2) unstable; urgency=low | ||
3574 | |||
3575 | * use pam patch from Ben Collins <bcollins@debian.org> | ||
3576 | * add slogin symlink to Makefile.in | ||
3577 | * change /usr/bin/login to LOGIN_PROGRAM define of /bin/login | ||
3578 | * sort out debconf usage | ||
3579 | * patch from Tommi Virtanen <tv@debian.org>'s makes ssh-add use ssh-askpass | ||
3580 | |||
3581 | -- Philip Hands <phil@hands.com> Thu, 4 Nov 1999 11:08:54 +0000 | ||
3582 | |||
3583 | openssh (1:1.2pre7-1) unstable; urgency=low | ||
3584 | |||
3585 | * New upstream release | ||
3586 | |||
3587 | -- Philip Hands <phil@hands.com> Tue, 2 Nov 1999 21:02:37 +0000 | ||
3588 | |||
3589 | openssh (1:1.2.0.pre6db1-2) unstable; urgency=low | ||
3590 | |||
3591 | * change the binary package name to ssh (the non-free branch of ssh has | ||
3592 | been renamed to ssh-nonfree) | ||
3593 | * make pam file comply with Debian standards | ||
3594 | * use an epoch to make sure openssh supercedes ssh-nonfree | ||
3595 | |||
3596 | -- Philip Hands <phil@hands.com> Sat, 30 Oct 1999 16:26:05 +0100 | ||
3597 | |||
3598 | openssh (1.2pre6db1-1) unstable; urgency=low | ||
3599 | |||
3600 | * New upstream source | ||
3601 | * sshd accepts logins now! | ||
3602 | |||
3603 | -- Dan Brosemer <odin@linuxfreak.com> Fri, 29 Oct 1999 11:13:38 -0500 | ||
3604 | |||
3605 | openssh (1.2.0.19991028-1) unstable; urgency=low | ||
3606 | |||
3607 | * New upstream source | ||
3608 | * Added test for -lnsl to configure script | ||
3609 | |||
3610 | -- Dan Brosemer <odin@linuxfreak.com> Thu, 28 Oct 1999 18:52:09 -0500 | ||
3611 | |||
3612 | openssh (1.2.0.19991027-3) unstable; urgency=low | ||
3613 | |||
3614 | * Initial release | ||
3615 | |||
3616 | -- Dan Brosemer <odin@linuxfreak.com> Wed, 27 Oct 1999 19:39:46 -0500 | ||
diff --git a/debian/clean b/debian/clean new file mode 100644 index 000000000..5da17f8eb --- /dev/null +++ b/debian/clean | |||
@@ -0,0 +1 @@ | |||
config.log | |||
diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..7f8f011eb --- /dev/null +++ b/debian/compat | |||
@@ -0,0 +1 @@ | |||
7 | |||
diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..78746affe --- /dev/null +++ b/debian/control | |||
@@ -0,0 +1,137 @@ | |||
1 | Source: openssh | ||
2 | Section: net | ||
3 | Priority: standard | ||
4 | Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org> | ||
5 | Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 8.1.0~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev, dh-systemd (>= 1.4) | ||
6 | Standards-Version: 3.8.4 | ||
7 | Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org> | ||
8 | Homepage: http://www.openssh.org/ | ||
9 | Vcs-Git: git://anonscm.debian.org/pkg-ssh/openssh.git | ||
10 | Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ssh/openssh.git | ||
11 | |||
12 | Package: openssh-client | ||
13 | Architecture: any | ||
14 | Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.10), dpkg (>= 1.7.0), passwd | ||
15 | Recommends: xauth | ||
16 | Conflicts: ssh (<< 1:3.8.1p1-9), sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) | ||
17 | Replaces: ssh, ssh-krb5 | ||
18 | Suggests: ssh-askpass, libpam-ssh, keychain, monkeysphere | ||
19 | Provides: rsh-client, ssh-client | ||
20 | Multi-Arch: foreign | ||
21 | Description: secure shell (SSH) client, for secure access to remote machines | ||
22 | This is the portable version of OpenSSH, a free implementation of | ||
23 | the Secure Shell protocol as specified by the IETF secsh working | ||
24 | group. | ||
25 | . | ||
26 | Ssh (Secure Shell) is a program for logging into a remote machine | ||
27 | and for executing commands on a remote machine. | ||
28 | It provides secure encrypted communications between two untrusted | ||
29 | hosts over an insecure network. X11 connections and arbitrary TCP/IP | ||
30 | ports can also be forwarded over the secure channel. | ||
31 | It can be used to provide applications with a secure communication | ||
32 | channel. | ||
33 | . | ||
34 | This package provides the ssh, scp and sftp clients, the ssh-agent | ||
35 | and ssh-add programs to make public key authentication more convenient, | ||
36 | and the ssh-keygen, ssh-keyscan, ssh-copy-id and ssh-argv0 utilities. | ||
37 | . | ||
38 | In some countries it may be illegal to use any encryption at all | ||
39 | without a special permit. | ||
40 | . | ||
41 | ssh replaces the insecure rsh, rcp and rlogin programs, which are | ||
42 | obsolete for most purposes. | ||
43 | |||
44 | Package: openssh-server | ||
45 | Priority: optional | ||
46 | Architecture: any | ||
47 | Pre-Depends: ${misc:Pre-Depends} | ||
48 | Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-14), libpam-modules (>= 0.72-9), adduser (>= 3.9), dpkg (>= 1.9.0), openssh-client (= ${binary:Version}), lsb-base (>= 4.1+Debian3), procps | ||
49 | Recommends: xauth, ncurses-term, ${openssh-server:Recommends} | ||
50 | Conflicts: ssh (<< 1:3.8.1p1-9), ssh-nonfree (<<2), ssh-socks, ssh2, sftp, rsh-client (<<0.16.1-1), ssh-krb5 (<< 1:4.3p2-7) | ||
51 | Replaces: ssh, openssh-client (<< 1:3.8.1p1-11), ssh-krb5 | ||
52 | Suggests: ssh-askpass, rssh, molly-guard, ufw, monkeysphere | ||
53 | Provides: ssh-server | ||
54 | Multi-Arch: foreign | ||
55 | Description: secure shell (SSH) server, for secure access from remote machines | ||
56 | This is the portable version of OpenSSH, a free implementation of | ||
57 | the Secure Shell protocol as specified by the IETF secsh working | ||
58 | group. | ||
59 | . | ||
60 | Ssh (Secure Shell) is a program for logging into a remote machine | ||
61 | and for executing commands on a remote machine. | ||
62 | It provides secure encrypted communications between two untrusted | ||
63 | hosts over an insecure network. X11 connections and arbitrary TCP/IP | ||
64 | ports can also be forwarded over the secure channel. | ||
65 | It can be used to provide applications with a secure communication | ||
66 | channel. | ||
67 | . | ||
68 | This package provides the sshd server. | ||
69 | . | ||
70 | In some countries it may be illegal to use any encryption at all | ||
71 | without a special permit. | ||
72 | . | ||
73 | sshd replaces the insecure rshd program, which is obsolete for most | ||
74 | purposes. | ||
75 | |||
76 | Package: ssh | ||
77 | Priority: extra | ||
78 | Architecture: all | ||
79 | Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version}) | ||
80 | Description: secure shell client and server (metapackage) | ||
81 | This metapackage is a convenient way to install both the OpenSSH client | ||
82 | and the OpenSSH server. It provides nothing in and of itself, so you | ||
83 | may remove it if nothing depends on it. | ||
84 | |||
85 | Package: ssh-krb5 | ||
86 | Section: oldlibs | ||
87 | Priority: extra | ||
88 | Architecture: all | ||
89 | Depends: ${misc:Depends}, openssh-client (>= ${binary:Version}), openssh-server (>= ${binary:Version}) | ||
90 | Description: secure shell client and server (transitional package) | ||
91 | This is a transitional package depending on the regular Debian OpenSSH | ||
92 | client and server, which now support GSSAPI natively. It will add the | ||
93 | necessary GSSAPI options to the server configuration file. You can | ||
94 | remove it once the upgrade is complete and nothing depends on it. | ||
95 | |||
96 | Package: ssh-askpass-gnome | ||
97 | Section: gnome | ||
98 | Priority: optional | ||
99 | Architecture: any | ||
100 | Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5 | ||
101 | Replaces: ssh (<< 1:3.5p1-3) | ||
102 | Provides: ssh-askpass | ||
103 | Description: interactive X program to prompt users for a passphrase for ssh-add | ||
104 | This has been split out of the main openssh-client package so that | ||
105 | openssh-client does not need to depend on GTK+. | ||
106 | . | ||
107 | You probably want the ssh-askpass package instead, but this is | ||
108 | provided to add to your choice and/or confusion. | ||
109 | |||
110 | Package: openssh-client-udeb | ||
111 | XC-Package-Type: udeb | ||
112 | Section: debian-installer | ||
113 | Priority: optional | ||
114 | Architecture: any | ||
115 | Depends: ${shlibs:Depends}, libnss-files-udeb | ||
116 | XB-Installer-Menu-Item: 99999 | ||
117 | Description: secure shell client for the Debian installer | ||
118 | This is the portable version of OpenSSH, a free implementation of | ||
119 | the Secure Shell protocol as specified by the IETF secsh working | ||
120 | group. | ||
121 | . | ||
122 | This package provides the ssh client for use in debian-installer. | ||
123 | |||
124 | Package: openssh-server-udeb | ||
125 | XC-Package-Type: udeb | ||
126 | Section: debian-installer | ||
127 | Priority: optional | ||
128 | Architecture: any | ||
129 | Depends: ${shlibs:Depends}, libnss-files-udeb | ||
130 | Description: secure shell server for the Debian installer | ||
131 | This is the portable version of OpenSSH, a free implementation of | ||
132 | the Secure Shell protocol as specified by the IETF secsh working | ||
133 | group. | ||
134 | . | ||
135 | This package provides the sshd server for use in debian-installer. | ||
136 | Since it is expected to be used in specialized situations (e.g. S/390 | ||
137 | installs with no console), it does not provide any configuration. | ||
diff --git a/debian/copyright.head b/debian/copyright.head new file mode 100644 index 000000000..c59278825 --- /dev/null +++ b/debian/copyright.head | |||
@@ -0,0 +1,52 @@ | |||
1 | This package was debianized by Philip Hands <phil@hands.com> on 31 Oct 1999 | ||
2 | (with help from Dan Brosemer <odin@linuxfreak.com>) | ||
3 | |||
4 | It was downloaded from here: | ||
5 | ftp://ftp.fu-berlin.de/unix/security/openssh/openssh-2.3.0p1.tar.gz | ||
6 | |||
7 | worldwide mirrors are listed here: | ||
8 | http://www.openssh.com/ftp.html | ||
9 | |||
10 | The Debian-specific parts of the package were initially derived from the | ||
11 | original ssh package, which has since been renamed as ssh-nonfree. | ||
12 | |||
13 | The Debian patch is distributed under the terms of the GPL, which you | ||
14 | can find in /usr/share/common-licenses/GPL. | ||
15 | |||
16 | In addition, as a special exception, Matthew Vernon gives permission | ||
17 | to link the code of the Debian patch with any version of the OpenSSH | ||
18 | code which is distributed under a license identical to that listed in | ||
19 | the included Copyright file, and distribute linked combinations | ||
20 | including the two. You must obey the GNU General Public License in | ||
21 | all respects for all of the code used other than OpenSSH. If you | ||
22 | modify this file, you may extend this exception to your version of the | ||
23 | file, but you are not obligated to do so. If you do not wish to do | ||
24 | so, delete this exception statement from your version. | ||
25 | |||
26 | The upstream source for this package is a combination of the ssh | ||
27 | branch that is being maintained by the OpenBSD team (starting from | ||
28 | the last version of SSH that was distributed under a free license), | ||
29 | and porting work by Damien Miller <damien@ibs.com.au> to get it | ||
30 | working on Linux. Other people also contributed to this, and are | ||
31 | credited in /usr/share/doc/ssh/README. | ||
32 | |||
33 | This package contains Kerberos version 5 patches from | ||
34 | http://www.sxw.org.uk/computing/patches/openssh.html; this is Copyright | ||
35 | (c) 2001-2009 Simon Wilkinson and provided under the standard 2-term BSD | ||
36 | licence used elsewhere in OpenSSH. | ||
37 | |||
38 | Copyright: | ||
39 | |||
40 | Code in helper.[ch] is Copyright Internet Business Solutions and is | ||
41 | released under a X11-style license (see source file for details). | ||
42 | |||
43 | (A)RC4 code in rc4.[ch] is Copyright Damien Miller. It too is under a | ||
44 | X11-style license (see source file for details). | ||
45 | |||
46 | make-ssh-known-hosts is Copyright Tero Kivinen <Tero.Kivinen@hut.fi>, | ||
47 | and is distributed under the GPL (see source file for details). | ||
48 | |||
49 | The copyright for the original SSH version follows. It has been | ||
50 | modified with [comments] to reflect the changes that the OpenBSD folks | ||
51 | have made: | ||
52 | |||
diff --git a/debian/faq.html b/debian/faq.html new file mode 100644 index 000000000..d6eb7fda5 --- /dev/null +++ b/debian/faq.html | |||
@@ -0,0 +1,1187 @@ | |||
1 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | ||
2 | <html> | ||
3 | <head> | ||
4 | <title>OpenSSH FAQ</title> | ||
5 | <link rev= "made" href= "mailto:www@openbsd.org"> | ||
6 | <meta name= "resource-type" content= "document"> | ||
7 | <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> | ||
8 | <meta name= "description" content= "the OpenSSH FAQ page"> | ||
9 | <meta name= "keywords" content= "OpenSSH,SSH,Secure Shell,faq"> | ||
10 | <meta name= "distribution" content= "global"> | ||
11 | <meta name= "copyright" content= "This document copyright 1999-2010 OpenBSD."> | ||
12 | </head> | ||
13 | |||
14 | <body bgcolor= "#ffffff" text= "#000000" link= "#23238E"> | ||
15 | <a href="http://www.openssh.org/index.html"><img alt="[OpenSSH]" height="30" width="141" src="images/smalltitle.gif" border="0"></a> | ||
16 | <p> | ||
17 | |||
18 | <h1>OpenSSH FAQ (Frequently asked questions)</h1> | ||
19 | |||
20 | <hr> | ||
21 | |||
22 | <blockquote> | ||
23 | <h3><a href= "#1.0">1.0 - What Is OpenSSH and Where Can I Get It?</a></h3> | ||
24 | <ul> | ||
25 | <li><a href= "#1.1">1.1 - What is OpenSSH and where can I download it?</a> | ||
26 | <li><a href= "#1.2">1.2 - Why should it be used?</a> | ||
27 | <li><a href= "#1.3">1.3 - What Operating Systems are supported?</a> | ||
28 | <li><a href= "#1.4">1.4 - What about copyright, usage and patents?</a> | ||
29 | <li><a href= "#1.5">1.5 - Where should I ask for help?</a> | ||
30 | <li><a href= "#1.6">1.6 - I have found a bug. Where do I report it?</a> | ||
31 | </ul> | ||
32 | |||
33 | <h3><a href= "#2.0">2.0 - General Questions</a></h3> | ||
34 | <ul> | ||
35 | <li><a href= "#2.1">2.1 - Why does ssh/scp make connections from low-numbered ports. My firewall blocks these.</a> | ||
36 | <li><a href= "#2.2">2.2 - Why is the ssh client setuid root?</a> | ||
37 | <li><a href= "#2.3">2.3 - Why does SSH 2.3 have problems interoperating with OpenSSH 2.1.1?</a> | ||
38 | <li><a href= "#2.4">2.4 - Why does OpenSSH print: Dispatch protocol error: type 20</a> | ||
39 | <li><a href= "#2.5">2.5 - Old versions of commercial SSH encrypt host keys with IDEA.</a> | ||
40 | <li><a href= "#2.6">2.6 - What are these warning messages about key lengths?</a> | ||
41 | <li><a href= "#2.7">2.7 - X11 and/or agent forwarding does not work.</a> | ||
42 | <li><a href= "#2.8">2.8 - After upgrading OpenSSH I lost SSH2 support.</a> | ||
43 | <li><a href= "#2.9">2.9 - sftp/scp fails at connection, but ssh is OK.</a> | ||
44 | <li><a href= "#2.10">2.10 - Will you add [foo] to scp?</a> | ||
45 | <li><a href= "#2.11">2.11 - How do I use port forwarding?</a> | ||
46 | <li><a href= "#2.12">2.12 - My ssh connection freezes or drops out after N minutes of inactivity.</a> | ||
47 | <li><a href= "#2.13">2.13 - How do I use scp to copy a file with a colon in it?</a> | ||
48 | <li><a href= "#2.14">2.14 - Why does OpenSSH report its version to clients?</a> | ||
49 | </ul> | ||
50 | |||
51 | <h3><a href= "#3.0">3.0 - Portable OpenSSH Questions</a></h3> | ||
52 | <ul> | ||
53 | <li><a href= "#3.1">3.1 - Spurious PAM authentication messages in logfiles.</a> | ||
54 | <li><a href= "#3.2">3.2 - Empty passwords not allowed with PAM authentication.</a> | ||
55 | <li><a href= "#3.3">3.3 - ssh(1) takes a long time to connect or log in</a> | ||
56 | <li><a href= "#3.4">3.4 - "Can't locate module net-pf-10" messages in log under Linux.</a> | ||
57 | <li><a href= "#3.5">3.5 - Password authentication doesn't work (eg on Slackware 7.0 or Red Hat Linux 6.x)</a> | ||
58 | <li><a href= "#3.6">3.6 - Configure or sshd(8) complain about lack of RSA support</a> | ||
59 | <li><a href= "#3.7">3.7 - "scp: command not found" errors</a> | ||
60 | <li><a href= "#3.8">3.8 - Unable to read passphrase</a> | ||
61 | <li><a href= "#3.9">3.9 - 'configure' missing or make fails</a> | ||
62 | <li><a href= "#3.10">3.10 - Hangs when exiting ssh</a> | ||
63 | <li><a href= "#3.11">3.11 - Why does ssh hang on exit?</a> | ||
64 | <li><a href= "#3.12">3.12 - I upgraded to OpenSSH 3.1 and X11 forwarding stopped working.</a> | ||
65 | <li><a href= "#3.13">3.13 - I upgraded to OpenSSH 3.8 and some X11 programs stopped working.</a> | ||
66 | <li><a href= "#3.14">3.14 - I copied my public key to authorized_keys but public-key authentication still doesn't work.</a> | ||
67 | <li><a href= "#3.15">3.15 - OpenSSH versions and PAM behaviour.</a> | ||
68 | <li><a href= "#3.16">3.16 - Why doesn't "w" or "who" on AIX 5.x show users logged in via ssh?</a> | ||
69 | </ul> | ||
70 | |||
71 | </blockquote> | ||
72 | |||
73 | <hr> | ||
74 | |||
75 | <h2><u><a name= "1.0">1.0 - What Is OpenSSH and Where Can I Get It?</a></u></h2> | ||
76 | |||
77 | <h2><a name= "1.1">1.1 - What is OpenSSH and where can I download it?</a></h2> | ||
78 | |||
79 | OpenSSH provides end-to-end encrypted replacement of applications such as | ||
80 | telnet, rlogin, and ftp. | ||
81 | Unlike these legacy applications, OpenSSH never passes anything | ||
82 | (including username and password) over the wire in unencrypted form, and | ||
83 | provides host authentication, to verify that you really are talking to | ||
84 | the system that you think you are and that no one else can take over | ||
85 | that session. | ||
86 | |||
87 | <p> | ||
88 | The OpenSSH suite includes the | ||
89 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&sektion=1">ssh(1)</a> | ||
90 | program which replaces rlogin and telnet, and | ||
91 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&sektion=1">scp(1)</a> | ||
92 | which replaces | ||
93 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=rcp&sektion=1">rcp(1)</a> and | ||
94 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ftp&sektion=1">ftp(1)</a>. | ||
95 | OpenSSH has also added | ||
96 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&sektion=1">sftp(1)</a> and | ||
97 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp-server&sektion=8">sftp-server(8)</a> | ||
98 | which implement an easier solution for file-transfer. This is based upon the | ||
99 | <a href="http://www.openssh.org/txt/draft-ietf-secsh-filexfer-02.txt">secsh-filexfer</a> IETF draft. | ||
100 | |||
101 | |||
102 | <p><strong>OpenSSH consists of a number of programs.</strong> | ||
103 | |||
104 | <ul> | ||
105 | <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&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. | ||
106 | Its behaviour is controlled by the config file <i><a | ||
107 | href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&sektion=5"> | ||
108 | sshd_config(5)</a></i>. | ||
109 | <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&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. | ||
110 | Its behaviour is controlled by the global config file <i><a | ||
111 | href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh_config&sektion=5"> | ||
112 | ssh_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&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&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&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&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&sektion=8">sftp-server(8)</a> - SFTP server subsystem. | ||
118 | <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sftp&sektion=1">sftp(1)</a> - Secure file transfer program. | ||
119 | <li><a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keyscan&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&sektion=8">ssh-keysign(8)</a> - ssh helper program for hostbased authentication. | ||
121 | </ul> | ||
122 | |||
123 | <h3>Downloading</h3> | ||
124 | |||
125 | <p> | ||
126 | The most recent version of OpenSSH is included with the current | ||
127 | distribution of <a href="http://www.openbsd.org/">OpenBSD</a>, and | ||
128 | installed as part of a basic install. | ||
129 | |||
130 | <p> | ||
131 | Today, most other operating systems include some version of OpenSSH | ||
132 | (often re-badged or privately labeled), so most users can immediately | ||
133 | use it. | ||
134 | However, sometimes the included versions are quite old, and missing | ||
135 | features of the current release of OpenSSH, and you may wish to install | ||
136 | the current version, or install it on one of the few OSs that lacked it, | ||
137 | and where the OS publisher does not make a modern version available. | ||
138 | You may also wish to use OpenSSH on your embedded application. | ||
139 | |||
140 | <p> | ||
141 | Non-OpenBSD users will want to download, compile and install the | ||
142 | multi-platform <a href="http://www.openssh.org/portable.html">Portable</a> distribution from a | ||
143 | <a href="http://www.openssh.org/portable.html#mirrors">mirror</a> near you. | ||
144 | |||
145 | |||
146 | <h2><a name= "1.2">1.2 - Why should it be used?</a></h2> | ||
147 | |||
148 | <p> | ||
149 | OpenSSH is a suite of tools to help secure your network | ||
150 | connections. 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> | ||
172 | Currently, almost all communications in computer networks are done | ||
173 | without encryption. As a consequence, anyone who has access to any | ||
174 | machine connected to the network can listen in on any communication. | ||
175 | This is being done by hackers, curious administrators, employers, | ||
176 | criminals, industrial spies, and governments. Some networks leak off | ||
177 | enough electromagnetic radiation that data may be captured even from a | ||
178 | distance. | ||
179 | |||
180 | |||
181 | <p> | ||
182 | When you log in, your password goes in the network in plain | ||
183 | text. Thus, any listener can then use your account to do any evil he | ||
184 | likes. Many incidents have been encountered worldwide where crackers | ||
185 | have started programs on workstations without the owner's knowledge | ||
186 | just to listen to the network and collect passwords. Programs for | ||
187 | doing this are available on the Internet, or can be built by a | ||
188 | competent programmer in a few hours. | ||
189 | |||
190 | |||
191 | <p> | ||
192 | Businesses have trade secrets, patent applications in preparation, | ||
193 | pricing information, subcontractor information, client data, personnel | ||
194 | data, financial information, etc. Currently, anyone with access to | ||
195 | the network (any machine on the network) can listen to anything that | ||
196 | goes in the network, without any regard to normal access restrictions. | ||
197 | |||
198 | |||
199 | <p> | ||
200 | Many companies are not aware that information can so easily be | ||
201 | recovered from the network. They trust that their data is safe | ||
202 | since nobody is supposed to know that there is sensitive information | ||
203 | in the network, or because so much other data is transferred in the | ||
204 | network. 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> | ||
210 | Even though OpenSSH is developed on | ||
211 | <a href="http://www.openbsd.org/">OpenBSD</a> a wide variety of | ||
212 | ports to other operating systems exist. The portable version of OpenSSH | ||
213 | is headed by <a href="mailto:djm@openbsd.org">Damien Miller</a>. | ||
214 | For a quick overview of the portable version of OpenSSH see | ||
215 | <a href="http://www.openssh.org/portable.html">OpenSSH Portable Release</a>. | ||
216 | Currently, 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> | ||
237 | A list of vendors that include OpenSSH in their distributions | ||
238 | is located in the <a href="http://www.openssh.org/users.html">OpenSSH Users page</a>. | ||
239 | |||
240 | <h2><a name= "1.4">1.4 - What about copyrights, usage and patents?</a></h2> | ||
241 | <p> | ||
242 | The OpenSSH developers have tried very hard to keep OpenSSH free of any | ||
243 | patent or copyright problems. To do this, some options had to be | ||
244 | stripped from OpenSSH. Namely support for patented algorithms. | ||
245 | |||
246 | <p> | ||
247 | OpenSSH does not support any patented transport algorithms. In SSH1 mode, | ||
248 | only 3DES and Blowfish are available options. In SSH2 mode, only 3DES, | ||
249 | Blowfish, CAST128, Arcfour and AES can be selected. | ||
250 | The patented IDEA algorithm is not supported. | ||
251 | |||
252 | <p> | ||
253 | OpenSSH provides support for both SSH1 and SSH2 protocols. | ||
254 | |||
255 | <p> | ||
256 | Since the RSA patent has expired, there are no restrictions on the use | ||
257 | of 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> | ||
261 | There are many places to turn to for help. In addition to the main | ||
262 | <a href="http://www.openssh.org/index.html">OpenSSH website</a>, | ||
263 | there are many mailing lists to try. Before trying any mailing lists, | ||
264 | please search through all mailing list archives to see if your question | ||
265 | has already been answered. The OpenSSH Mailing List has been archived and | ||
266 | put in searchable form and can be found at | ||
267 | <a href="http://marc.info/?l=openssh-unix-dev&r=1&w=2">marc.info</a>. | ||
268 | |||
269 | <p> | ||
270 | For more information on subscribing to OpenSSH related mailing lists, | ||
271 | please see <a href="http://www.openssh.org/list.html">OpenSSH Mailing lists</a>. | ||
272 | |||
273 | <h2><a name= "1.6">1.6 - I have found a bug. Where do I report it?</a></h2> | ||
274 | <p> | ||
275 | Information about submitting bug reports can be found at the OpenSSH | ||
276 | <a href="http://www.openssh.org/report.html">Reporting bugs</a> page. | ||
277 | <p> | ||
278 | If you wish to report a security bug, please contact the private developers | ||
279 | list <<a href="mailto:openssh@openssh.com">openssh@openssh.com</a>>. | ||
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> | ||
285 | The OpenSSH client uses low numbered ports for rhosts and rhosts-rsa | ||
286 | authentication because the server needs to trust the username provided by | ||
287 | the 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> | ||
302 | Or you can specify this option on the command line, using the <b>-o</b> | ||
303 | option to | ||
304 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&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> | ||
319 | In conjunction with the previous question, (<a href="#2.1">2.1</a>) | ||
320 | OpenSSH needs root authority to be able to bind to low-numbered ports to | ||
321 | facilitate <i>rhosts authentication</i>. | ||
322 | A privileged port is also required for rhosts-rsa authentication to older | ||
323 | SSH releases. | ||
324 | |||
325 | <p> | ||
326 | Additionally, for both <i>rhosts-rsa authentication</i> (in protocol | ||
327 | version 1) and <i>hostbased authentication</i> (in protocol version 2) | ||
328 | the ssh client needs to access the <i>private host key</i> in order to | ||
329 | authenticate the client machine to the server. | ||
330 | OpenSSH versions prior to 3.3 required the <code>ssh</code> binary to be | ||
331 | setuid root to enable this, and you may safely remove it if you don't | ||
332 | want to use these authentication methods. | ||
333 | |||
334 | <p> | ||
335 | Starting in OpenSSH 3.3, <code>ssh</code> is not setuid by default. <a | ||
336 | href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keysign">ssh-keysign</a>, | ||
337 | is used for access to the private hosts keys, and ssh does not use privileged | ||
338 | source ports by default. If you wish to use a privileged source port, you must | ||
339 | manually 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> | ||
344 | SSH 2.3 and earlier versions contain a flaw in their HMAC implementation. | ||
345 | Their code was not supplying the full data block output from the digest, | ||
346 | and instead always provided 128 bits. For longer digests, this caused | ||
347 | SSH 2.3 to not interoperate with OpenSSH. | ||
348 | |||
349 | <p> | ||
350 | OpenSSH 2.2.0 detects that SSH 2.3 has this flaw. Recent versions of SSH | ||
351 | will have this bug fixed. Or you can add the following to | ||
352 | SSH 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> | ||
368 | Problems in interoperation have been seen because older versions of | ||
369 | OpenSSH did not support session rekeying. However the commercial SSH 2.3 | ||
370 | tries to negotiate this feature, and you might experience connection | ||
371 | freezes or see the error message "<b>Dispatch protocol error: | ||
372 | type 20 </b>". | ||
373 | To solve this problem, either upgrade to a recent OpenSSH release or | ||
374 | disable 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> | ||
391 | The 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&sektion=8">sshd(8)</a> | ||
394 | not being able to read its host key. To solve this, use the command below | ||
395 | to 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&sektion=1">ssh-keygen(1)</a> | ||
398 | program from the Commercial SSH product, *NOT* OpenSSH for the example | ||
399 | below. | ||
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> | ||
415 | Commercial SSH's | ||
416 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh-keygen&sektion=1">ssh-keygen(1)</a> | ||
417 | program contained a bug which caused it to occasionally generate Pubkey | ||
418 | Authentication (RSA or DSA) keys which had their Most Significant Bit | ||
419 | (MSB) unset. Such keys were advertised as being full-length, but are | ||
420 | actually, half the time, smaller than advertised. | ||
421 | |||
422 | <p> | ||
423 | OpenSSH will print warning messages when it encounters such keys. To rid | ||
424 | yourself of these message, edit your <i>known_hosts</i> files and replace the | ||
425 | incorrect 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> | ||
431 | Check your <i>ssh_config</i> and <i>sshd_config</i>. The default | ||
432 | configuration files disable authentication agent and X11 forwarding. To | ||
433 | enable 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> | ||
446 | and 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> | ||
460 | X11 forwarding requires a working <a | ||
461 | href="http://www.openbsd.org/cgi-bin/man.cgi?query=xauth&sektion=1" | ||
462 | >xauth(1)</a> binary. On OpenBSD this is in the <i>xbase</i> file | ||
463 | set but will probably be different on other platforms. For OpenSSH | ||
464 | Portable, xauth must be either found at configure time or specified | ||
465 | via <b>XAuthLocation</b> in sshd_config(5) and ssh_config(5). | ||
466 | |||
467 | <p> | ||
468 | Note on agent interoperability: There are two different and | ||
469 | incompatible agent forwarding mechanisms within the SSH2 protocol. | ||
470 | OpenSSH has always used an extension of the original SSH1 agent | ||
471 | requests, however some commercial products use a different, non-free | ||
472 | agent forwarding protocol. This means that agent forwarding cannot | ||
473 | be 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>, | ||
478 | and thus any bash user's home directory. This variable is set by OpenSSH | ||
479 | and for either of the above options to work, you need to comment out | ||
480 | the 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> | ||
496 | Between 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 | ||
498 | versions of OpenSSH. After OpenSSH Version 2.3.0 you need to add the | ||
499 | following 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> | ||
516 | sftp and/or scp may fail at connection time if you have shell | ||
517 | initialization (.profile, .bashrc, .cshrc, etc) which produces output | ||
518 | for non-interactive sessions. This output confuses the sftp/scp client. | ||
519 | You 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> | ||
532 | If the above command produces any output, then you need to modify your | ||
533 | shell initialization. | ||
534 | |||
535 | <h2><a name= "2.10">2.10 - Will you add [foo] to scp?</a></h2> | ||
536 | |||
537 | <p> | ||
538 | Short Answer: no. | ||
539 | |||
540 | <p> | ||
541 | Long Answer: scp is not standardized. The closest thing it has to a | ||
542 | specification is "what rcp does". Since the same command is used on both ends | ||
543 | of the connection, adding features or options risks breaking interoperability with other | ||
544 | implementations. | ||
545 | |||
546 | <p> | ||
547 | New 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"> | ||
549 | draft 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> | ||
554 | If the remote server is running sshd(8), it may be possible to | ||
555 | ``tunnel'' certain services via ssh. This may be desirable, for | ||
556 | example, to encrypt POP or SMTP connections, even though the software | ||
557 | does not directly support encrypted communications. Tunnelling uses | ||
558 | port forwarding to create a connection between the client and server. | ||
559 | The client software must be able to specify a non-standard port to | ||
560 | connect to for this to work. | ||
561 | |||
562 | <p> | ||
563 | The idea is that the user connects to the remote host using ssh, | ||
564 | and specifies which port on the client's machine should be used to | ||
565 | forward connections to the remote server. After that it is possible | ||
566 | to start the service which is to be encrypted (e.g. fetchmail, irc) | ||
567 | on the client machine, specifying the same local port passed to | ||
568 | ssh, and the connection will be tunnelled through ssh. By default, | ||
569 | the system running the forward will only accept connections from | ||
570 | itself. | ||
571 | |||
572 | <p> | ||
573 | The options most relevant to tunnelling are the -L and -R options, | ||
574 | which allow the user to forward connections, the -D option, which | ||
575 | permits dynamic port forwarding, the -g option, which permits other | ||
576 | hosts to use port forwards, and the -f option, which instructs ssh | ||
577 | to put itself in the background after authentication. See the <a | ||
578 | href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh&sektion=1" | ||
579 | >ssh(1)</a> man page for further details. | ||
580 | |||
581 | <p> | ||
582 | This 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> | ||
590 | irc -c '#users' -p 1234 pinky 127.0.0.1</b> | ||
591 | </td> | ||
592 | </tr> | ||
593 | </table> | ||
594 | </blockquote> | ||
595 | |||
596 | <p> | ||
597 | This tunnels a connection to IRC server server.example.com, joining | ||
598 | channel ``#users'', using the nickname ``pinky''. The local port used | ||
599 | in this example is 1234. It does not matter which port is used, as | ||
600 | long as it's greater than 1023 (remember, only root can open sockets on | ||
601 | privileged ports) and doesn't conflict with any ports already in use. | ||
602 | The connection is forwarded to port 6667 on the remote server, since | ||
603 | that's the standard port for IRC services. | ||
604 | |||
605 | <p> | ||
606 | The remote command ``sleep 10'' was specified to allow an amount | ||
607 | of time (10 seconds, in the example) to start the service which is to | ||
608 | be tunnelled. If no connections are made within the time specified, | ||
609 | ssh will exit. If more time is required, the sleep(1) value can be | ||
610 | increased appropriately or, alternatively, the example above could | ||
611 | be added as a function to the user's shell. See ksh(1) and csh(1) | ||
612 | for more details about user-defined functions. | ||
613 | |||
614 | <p> | ||
615 | ssh also has an -N option, convenient for use with port forwarding: | ||
616 | if -N is specified, it is not necessary to specify a remote command | ||
617 | (``sleep 10'' in the example above). However, use of this option | ||
618 | causes ssh to wait around for ever (as opposed to exiting after a | ||
619 | remote command has completed), and the user must take care to manually | ||
620 | kill(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> | ||
625 | This is usually the result of a packet filter or NAT device | ||
626 | timing out your TCP connection due to inactivity. You can enable | ||
627 | <b>ClientAliveInterval</b> in the server's <i><a | ||
628 | href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd_config&sektion=5"> | ||
629 | sshd_config</a></i>, or enable <b>ServerAliveInterval</b> in the | ||
630 | client's <i><a | ||
631 | href="http://www.openbsd.org/cgi-bin/man.cgi?query=ssh_config&sektion=5"> | ||
632 | ssh_config</a></i> (the latter is available in OpenSSH 3.8 and newer). | ||
633 | |||
634 | <p> | ||
635 | Enabling either option and setting the interval for less than the time | ||
636 | it takes to time out your session will ensure that the connection is | ||
637 | kept "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 | ||
642 | href="http://www.openbsd.org/cgi-bin/man.cgi?query=scp&sektion=1"> | ||
643 | scp</a></b> will interpret the component before the colon to be a remote | ||
644 | server name and attempt to connect to it. To prevent this, refer to | ||
645 | the 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> | ||
660 | OpenSSH, like most SSH implementations, reports its name and version to clients | ||
661 | when they connect, e.g. | ||
662 | </p> | ||
663 | |||
664 | <blockquote> | ||
665 | SSH-2.0-OpenSSH_3.9 | ||
666 | </blockquote> | ||
667 | |||
668 | <p> | ||
669 | This information is used by clients and servers to enable protocol | ||
670 | compatibility tweaks to work around changed, buggy or missing features in | ||
671 | the implementation they are talking to. This protocol feature checking is | ||
672 | still required at present because versions with incompatibilities are still | ||
673 | in 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> | ||
681 | The portable version of OpenSSH will generate spurious authentication | ||
682 | failures at every login, similar to: | ||
683 | |||
684 | |||
685 | <blockquote> | ||
686 | <table border=0 width="800"> | ||
687 | <tr> | ||
688 | <td nowrap bgcolor="#EEEEEE"> | ||
689 | "<b>authentication failure; (uid=0) -> root for sshd service</b>" | ||
690 | </td> | ||
691 | </tr> | ||
692 | </table> | ||
693 | </blockquote> | ||
694 | |||
695 | <p> | ||
696 | These are generated because OpenSSH first tries to determine whether a | ||
697 | user needs authentication to login (e.g. empty password). Unfortunately | ||
698 | PAM likes to log all authentication events, this one included. | ||
699 | |||
700 | <p> | ||
701 | If it annoys you too much, set "<b>PermitEmptyPasswords no</b>" | ||
702 | in <i>sshd_config</i>. This will quiet the error message at the expense | ||
703 | of disabling logins to accounts with no password set. | ||
704 | This 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> | ||
709 | To enable empty passwords with a version of OpenSSH built with PAM you | ||
710 | must add the flag nullok to the end of the password checking module | ||
711 | in 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"> | ||
717 | auth required/lib/security/pam_unix.so shadow nodelay nullok | ||
718 | </td> | ||
719 | </tr> | ||
720 | </table> | ||
721 | </blockquote> | ||
722 | |||
723 | <p> | ||
724 | This must be done in addition to setting "<b>PermitEmptyPasswords | ||
725 | yes</b>" in the <i>sshd_config</i> file. | ||
726 | |||
727 | <p> | ||
728 | There is one caveat when using empty passwords with PAM authentication: | ||
729 | PAM will allow any password when authenticating an account with an empty | ||
730 | password. This breaks the check that | ||
731 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=sshd&sektion=8">sshd(8)</a> | ||
732 | uses to determine whether an account has no password set and grant | ||
733 | users access to the account regardless of the policy specified by | ||
734 | <b>PermitEmptyPasswords</b>. For this reason, it is recommended that you | ||
735 | do not add the <b>nullok</b> directive to your PAM configuration file | ||
736 | unless 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 | ||
740 | in</a></h2> | ||
741 | |||
742 | <p> | ||
743 | Large delays (more than 10 seconds) are typically caused by a problem with | ||
744 | name resolution: | ||
745 | <ul> | ||
746 | <li>Some versions of glibc (notably glibc 2.1 shipped with Red Hat 6.1) | ||
747 | can take a long time to resolve "IPv6 or IPv4" addresses from domain | ||
748 | names. This can be worked around with by specifying <b>AddressFamily | ||
749 | inet</b> option in <i>ssh_config</i>.</li> | ||
750 | |||
751 | <li>There may be a DNS lookup problem, either at the client or server. | ||
752 | You can use the <code>nslookup</code> command to check this on both client | ||
753 | and server by looking up the other end's name and IP address. In | ||
754 | addition, on the server look up the name returned by the client's | ||
755 | IP-name lookup. You can disable most of the server-side lookups by | ||
756 | setting <b>UseDNS no</b> in <i>sshd_config</i>.</li> | ||
757 | </ul> | ||
758 | |||
759 | <p> | ||
760 | Delays 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 | ||
765 | moduli that were just smaller than what sshd would look for, and | ||
766 | as a result, sshd would end up using moduli significantly larger | ||
767 | than requested, which resulted in a speed penalty. Replacing the | ||
768 | <i>moduli</i> file will resolve this (note that in most cases this | ||
769 | file will not be replaced during an upgrade and must be replaced | ||
770 | manually).</li> | ||
771 | |||
772 | <li>OpenSSH releases prior to 3.8 had a flaw in <code>ssh</code> that | ||
773 | would cause it to request moduli larger than intended (which when | ||
774 | combined with the above resulted in significant slowdowns). | ||
775 | Upgrading 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 | ||
778 | device (eg Solaris < 9, AIX < 5.2, HP-UX < 11.11) and no | ||
779 | substitute is available (eg <a href= | ||
780 | "ftp://ftp.ayamura.org/pub/prngd/">prngd</a>) it's possible that | ||
781 | one of the programs called by <code>ssh-rand-helper</code> to | ||
782 | generate entropy is hanging. This can be investigated by running | ||
783 | it 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 | |||
795 | Any significant delays should be investigated and rectified, or the | ||
796 | corresponding commands should be removed from <i>ssh_prng_cmds</i>. | ||
797 | </li> | ||
798 | |||
799 | </ul> | ||
800 | |||
801 | <h3>How slow is "slow"?</h3> | ||
802 | Under normal conditions, the speed of SSH logins is dependant on | ||
803 | CPU speed of client and server. For comparison the following are | ||
804 | typical connect times for <code>time ssh localhost true</code> | ||
805 | with a 1024-bit RSA key on otherwise unloaded hosts. OpenSSH and | ||
806 | OpenSSL 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 | ||
823 | cryptographically weaker than SSHv2.<br> | ||
824 | |||
825 | <a name="3.3fn2">[2]</a> At the time of writing, gcc generates | ||
826 | relatively 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 | ||
828 | bug #7625</a> and <a | ||
829 | href="http://marc.info/?l=openssh-unix-dev&m=102646106016694"> | ||
830 | discussion 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> | ||
835 | The Linux kernel is looking (via modprobe) for protocol family 10 (IPv6). | ||
836 | Either 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> | ||
841 | For 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> | ||
848 | If the password is correct password the login is still denied, the | ||
849 | usual cause is that the system is configured to use MD5-type passwords | ||
850 | but the | ||
851 | <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=crypt&sektion=3" | ||
852 | >crypt(3)</a> function used by sshd doesn't understand them. | ||
853 | |||
854 | <p> | ||
855 | Affected accounts will have password strings in <i>/etc/passwd</i> | ||
856 | or <i>/etc/shadow</i> that start with <b>$1$</b>. | ||
857 | If password authentication fails for new accounts or accounts with | ||
858 | recently changed passwords, but works for old accounts, this is the | ||
859 | likely culprit. | ||
860 | |||
861 | <p> | ||
862 | The underlying cause is that some versions of OpenSSL have a crypt(3) | ||
863 | function that does not understand MD5 passwords, and the link order of | ||
864 | sshd means that OpenSSL's crypt(3) is used instead of the system's. | ||
865 | OpensSSH's configure attempts to correct for this but is not always | ||
866 | successful. | ||
867 | |||
868 | <p> | ||
869 | There are several possible solutions: | ||
870 | |||
871 | <ul> | ||
872 | <li> | ||
873 | <p> | ||
874 | Enable 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 | |||
886 | This is safe even if you have both types of encryption as sshd will | ||
887 | select the correct algorithm for each account automatically. | ||
888 | |||
889 | <li> | ||
890 | <p> | ||
891 | If your system has a separate libcrypt library (eg Slackware 7) then you | ||
892 | can manually add -lcrypt to the LIBS list so it's used instead of | ||
893 | OpenSSL's: | ||
894 | |||
895 | <blockquote> | ||
896 | <table border=0 width="800"> | ||
897 | <tr> | ||
898 | <td nowrap bgcolor="#EEEEEE"> | ||
899 | LIBS=-lcrypt ./configure [options] | ||
900 | </td> | ||
901 | </tr> | ||
902 | </table> | ||
903 | </blockquote> | ||
904 | |||
905 | <li> | ||
906 | <p> | ||
907 | If 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 | ||
909 | not 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> | ||
915 | Ensure that your OpenSSL libraries have been built to include RSA or DSA | ||
916 | support 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&sektion=1">scp(1)</a> | ||
923 | must be in the default PATH on both the client and the server. You may | ||
924 | need to use the <b>--with-default-path</b> option to specify a custom | ||
925 | path to search on the server. This option replaces the default path, | ||
926 | so you need to specify all the current directories on your path as well | ||
927 | as 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> | ||
940 | Note that configuration by the server's admin will take precedence over the | ||
941 | setting 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 | ||
943 | above) setting PATH or SUPATH in <i>/etc/default/login</i> on Solaris or | ||
944 | Reliant Unix. | ||
945 | |||
946 | <h2><a name= "3.8">3.8 - Unable to read passphrase</a></h2> | ||
947 | |||
948 | <p> | ||
949 | Some operating systems set <i>/dev/tty</i> with incorrect modes, causing | ||
950 | the 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"> | ||
956 | You have no controlling tty. Cannot read passphrase. | ||
957 | </td> | ||
958 | </tr> | ||
959 | </table> | ||
960 | </blockquote> | ||
961 | |||
962 | <p> | ||
963 | The solution to this is to reset the permissions on <i>/dev/tty</i> | ||
964 | to 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> | ||
970 | If there is no 'configure' file in the tar.gz file that you downloaded | ||
971 | or make fails with "missing separator" errors, you have probably | ||
972 | downloaded the OpenBSD distribution of OpenSSH and are attempting to | ||
973 | compile it on another platform. Please refer to the information on the | ||
974 | <a href="http://www.openssh.org/portable.html">portable version</a>. | ||
975 | |||
976 | |||
977 | <h2><a name= "3.10">3.10 - Hangs when exiting ssh</a></h2> | ||
978 | |||
979 | <p> | ||
980 | OpenSSH may hang when exiting. This can occur when there is an active | ||
981 | background process. This is known to occur on Linux and HP-UX. | ||
982 | The 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 & exit</b> | ||
989 | </td> | ||
990 | </tr> | ||
991 | </table> | ||
992 | </blockquote> | ||
993 | |||
994 | Try to use this instead: | ||
995 | <blockquote> | ||
996 | <table border=0 width="800"> | ||
997 | <tr> | ||
998 | <td nowrap bgcolor="#EEEEEE"> | ||
999 | $ <b>sleep 20 < /dev/null > /dev/null 2>&1 &</b> | ||
1000 | </td> | ||
1001 | </tr> | ||
1002 | </table> | ||
1003 | </blockquote> | ||
1004 | |||
1005 | <p> | ||
1006 | A work around for bash users is to place <b>"shopt -s huponexit"</b> | ||
1007 | in either /etc/bashrc or ~/.bashrc. Otherwise, consult your shell's | ||
1008 | man page for an option to enable it to send a HUP signal to active | ||
1009 | jobs when exiting. See <a | ||
1010 | href="http://bugzilla.mindrot.org/show_bug.cgi?id=52">bug #52</a> | ||
1011 | for other workarounds. | ||
1012 | |||
1013 | <h2><a name= "3.11">3.11 - Why does ssh hang on exit?</a></h2> | ||
1014 | |||
1015 | <p> | ||
1016 | When 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> | ||
1026 | ssh <b>needs</b> to hang, because it needs to wait: | ||
1027 | <ul> | ||
1028 | <li> | ||
1029 | until it can be sure that <code>command</code> does not need | ||
1030 | more input. | ||
1031 | <li> | ||
1032 | until it can be sure that <code>command</code> does not produce | ||
1033 | more output. | ||
1034 | <li> | ||
1035 | until <code>command</code> exits because sshd needs to tell | ||
1036 | the 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 | ||
1041 | forwarding stopped working.</a></h2> | ||
1042 | |||
1043 | Starting with OpenSSH 3.1, the sshd x11 forwarding server listens on | ||
1044 | localhost by default; see the sshd <b>X11UseLocalhost</b> option to | ||
1045 | revert to prior behaviour if your older X11 clients do not function | ||
1046 | with this configuration.<p> | ||
1047 | |||
1048 | In general, X11 clients using X11 R6 should work with the default | ||
1049 | setting. Some vendors, including HP, ship X11 clients with R6 | ||
1050 | and R5 libs, so some clients will work, and others will not work. | ||
1051 | This 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 | ||
1054 | X11 programs stopped working.</a></h2> | ||
1055 | |||
1056 | <p> | ||
1057 | As documented in the <a href="http://www.openssh.org/txt/release-3.8">3.8 release notes</a>, | ||
1058 | <code>ssh</code> will now use untrusted X11 cookies by | ||
1059 | default. The previous behaviour can be restored by setting | ||
1060 | <b>ForwardX11Trusted yes</b> in <i>ssh_config</i>. | ||
1061 | |||
1062 | <p> | ||
1063 | Possible symptoms include:<br> | ||
1064 | <code>BadWindow (invalid Window parameter)<br> | ||
1065 | BadAccess (attempt to access private resource denied)<br> | ||
1066 | X Error of failed request: BadAtom (invalid Atom parameter)<br> | ||
1067 | Major 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 | ||
1070 | but public-key authentication still doesn't work.</a></h2> | ||
1071 | |||
1072 | <p> | ||
1073 | Typically 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> | ||
1077 | In 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> | ||
1091 | If 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 | ||
1093 | recommended. | ||
1094 | |||
1095 | <h2><a name= "3.15">3.15 - OpenSSH versions and PAM behaviour.</a></h2> | ||
1096 | |||
1097 | Portable 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 | |||
1111 | To use PAM at all, this option must be provided at build time. | ||
1112 | The run-time behaviour when PAM is built in varies with the version of | ||
1113 | Portable 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> | ||
1117 | The behaviour of the relevant authentications options when PAM support is built | ||
1118 | in 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><=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 | ||
1151 | backported the PasswordAuthentication from 3.9p1 to their 3.8x based | ||
1152 | packages. If you're using a vendor-supplied package then consult their | ||
1153 | documentation. | ||
1154 | |||
1155 | <p> | ||
1156 | OpenSSH Portable's PAM interface still has problems with a few modules, | ||
1157 | however we hope that this number will reduce in the future. As at the | ||
1158 | 3.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 | |||
1168 | You can also check <a | ||
1169 | href="http://bugzilla.mindrot.org/buglist.cgi?product=Portable+OpenSSH&bug_status=RESOLVED&bug_status=NEW&bug_status=ACCEPTED&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 | ||
1173 | logged in via ssh?</a></h2> | ||
1174 | |||
1175 | Between AIX 4.3.3 and AIX 5.x, the format of the wtmp struct changed. This | ||
1176 | means that sshd binaries built on AIX 4.x will not correctly write wtmp | ||
1177 | entries when run on AIX 5.x. This can be fixed by simply recompiling | ||
1178 | sshd on an AIX 5.x system and using that. | ||
1179 | |||
1180 | <hr> | ||
1181 | <a href="http://www.openssh.org/index.html"><img height=24 width=24 src="back.gif" border=0 alt=OpenSSH></a> | ||
1182 | <a href="mailto:www@openbsd.org">www@openbsd.org</a> | ||
1183 | <br> | ||
1184 | <small>$OpenBSD: faq.html,v 1.113 2012/04/21 12:12:22 dtucker Exp $</small> | ||
1185 | |||
1186 | </body> | ||
1187 | </html> | ||
diff --git a/debian/gnome-ssh-askpass.1 b/debian/gnome-ssh-askpass.1 new file mode 100644 index 000000000..b74c410a8 --- /dev/null +++ b/debian/gnome-ssh-askpass.1 | |||
@@ -0,0 +1,51 @@ | |||
1 | .TH GNOME-SSH-ASKPASS 1 | ||
2 | .SH NAME | ||
3 | gnome\-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 | ||
8 | is a GNOME-based passphrase dialog for use with OpenSSH. | ||
9 | It is intended to be called by the | ||
10 | .BR ssh\-add (1) | ||
11 | program and not invoked directly. | ||
12 | It allows | ||
13 | .BR ssh\-add (1) | ||
14 | to obtain a passphrase from a user, even if not connected to a terminal | ||
15 | (assuming that an X display is available). | ||
16 | This happens automatically in the case where | ||
17 | .B ssh\-add | ||
18 | is invoked from one's | ||
19 | .B ~/.xsession | ||
20 | or as one of the GNOME startup programs, for example. | ||
21 | .PP | ||
22 | In order to be called automatically by | ||
23 | .BR ssh\-add , | ||
24 | .B gnome\-ssh\-askpass | ||
25 | should be installed as | ||
26 | .IR /usr/bin/ssh\-askpass . | ||
27 | .SH "ENVIRONMENT VARIABLES" | ||
28 | The following environment variables are recognized: | ||
29 | .TP | ||
30 | .I GNOME_SSH_ASKPASS_GRAB_SERVER | ||
31 | Causes | ||
32 | .B gnome\-ssh\-askpass | ||
33 | to grab the X server before asking for a passphrase. | ||
34 | .TP | ||
35 | .I GNOME_SSH_ASKPASS_GRAB_POINTER | ||
36 | Causes | ||
37 | .B gnome\-ssh\-askpass | ||
38 | to grab the mouse pointer using | ||
39 | .IR gdk_pointer_grab () | ||
40 | before asking for a passphrase. | ||
41 | .PP | ||
42 | Regardless of whether either of these environment variables is set, | ||
43 | .B gnome\-ssh\-askpass | ||
44 | will grab the keyboard using | ||
45 | .IR gdk_keyboard_grab (). | ||
46 | .SH AUTHOR | ||
47 | This manual page was written by Colin Watson <cjwatson@debian.org> | ||
48 | for the Debian system (but may be used by others). | ||
49 | It was based on that for | ||
50 | .B x11\-ssh\-askpass | ||
51 | by Philip Hands. | ||
diff --git a/debian/openssh-client-udeb.dirs b/debian/openssh-client-udeb.dirs new file mode 100644 index 000000000..e77248175 --- /dev/null +++ b/debian/openssh-client-udeb.dirs | |||
@@ -0,0 +1 @@ | |||
usr/bin | |||
diff --git a/debian/openssh-client-udeb.install b/debian/openssh-client-udeb.install new file mode 100644 index 000000000..b3891f02d --- /dev/null +++ b/debian/openssh-client-udeb.install | |||
@@ -0,0 +1,3 @@ | |||
1 | scp usr/bin | ||
2 | sftp usr/bin | ||
3 | ssh usr/bin | ||
diff --git a/debian/openssh-client.apport b/debian/openssh-client.apport new file mode 100644 index 000000000..3dbc8e5e6 --- /dev/null +++ b/debian/openssh-client.apport | |||
@@ -0,0 +1,32 @@ | |||
1 | #!/usr/bin/python | ||
2 | |||
3 | '''apport hook for openssh-client | ||
4 | |||
5 | (c) 2010 Canonical Ltd. | ||
6 | Author: Chuck Short <chuck.short@canonical.com> | ||
7 | |||
8 | This program is free software; you can redistribute it and/or modify it | ||
9 | under the terms of the GNU General Public License as published by the | ||
10 | Free Software Foundation; either version 2 of the License, or (at your | ||
11 | option) any later version. See http://www.gnu.org/copyleft/gpl.html for | ||
12 | the full text of the license. | ||
13 | ''' | ||
14 | |||
15 | from apport.hookutils import * | ||
16 | |||
17 | def add_info(report, ui): | ||
18 | response = ui.yesno("The contents of your /etc/ssh/ssh_config file " | ||
19 | "may help developers diagnose your bug more " | ||
20 | "quickly. However, it may contain sensitive " | ||
21 | "information. Do you want to include it in your " | ||
22 | "bug report?") | ||
23 | |||
24 | if response == None: # user cancelled | ||
25 | raise StopIteration | ||
26 | |||
27 | elif response == True: | ||
28 | attach_conffiles(report, 'openssh-client') | ||
29 | |||
30 | attach_related_packages(report, | ||
31 | ['ssh-askpass', 'libpam-ssh', 'keychain', 'ssh-askpass-gnome']) | ||
32 | report['SSHClientVersion'] = command_output(['/usr/bin/ssh', '-V']) | ||
diff --git a/debian/openssh-client.dirs b/debian/openssh-client.dirs new file mode 100644 index 000000000..bbe54c691 --- /dev/null +++ b/debian/openssh-client.dirs | |||
@@ -0,0 +1 @@ | |||
usr/share/apport/package-hooks | |||
diff --git a/debian/openssh-client.docs b/debian/openssh-client.docs new file mode 100644 index 000000000..d80ec1262 --- /dev/null +++ b/debian/openssh-client.docs | |||
@@ -0,0 +1,6 @@ | |||
1 | ChangeLog.gssapi | ||
2 | OVERVIEW | ||
3 | README | ||
4 | README.dns | ||
5 | README.tun | ||
6 | debian/faq.html | ||
diff --git a/debian/openssh-client.install b/debian/openssh-client.install new file mode 100644 index 000000000..6a8060000 --- /dev/null +++ b/debian/openssh-client.install | |||
@@ -0,0 +1,27 @@ | |||
1 | etc/ssh/moduli | ||
2 | etc/ssh/ssh_config | ||
3 | usr/bin/scp | ||
4 | usr/bin/sftp | ||
5 | usr/bin/slogin | ||
6 | usr/bin/ssh | ||
7 | usr/bin/ssh-add | ||
8 | usr/bin/ssh-agent | ||
9 | usr/bin/ssh-keygen | ||
10 | usr/bin/ssh-keyscan | ||
11 | usr/lib/openssh/ssh-keysign | ||
12 | usr/lib/openssh/ssh-pkcs11-helper | ||
13 | usr/share/man/man1/scp.1 | ||
14 | usr/share/man/man1/sftp.1 | ||
15 | usr/share/man/man1/slogin.1 | ||
16 | usr/share/man/man1/ssh-add.1 | ||
17 | usr/share/man/man1/ssh-agent.1 | ||
18 | usr/share/man/man1/ssh-keygen.1 | ||
19 | usr/share/man/man1/ssh-keyscan.1 | ||
20 | usr/share/man/man1/ssh.1 | ||
21 | usr/share/man/man5/moduli.5 | ||
22 | usr/share/man/man5/ssh_config.5 | ||
23 | usr/share/man/man8/ssh-keysign.8 | ||
24 | usr/share/man/man8/ssh-pkcs11-helper.8 | ||
25 | |||
26 | contrib/ssh-copy-id usr/bin | ||
27 | debian/ssh-argv0 usr/bin | ||
diff --git a/debian/openssh-client.lintian-overrides b/debian/openssh-client.lintian-overrides new file mode 100644 index 000000000..486567744 --- /dev/null +++ b/debian/openssh-client.lintian-overrides | |||
@@ -0,0 +1 @@ | |||
openssh-client: setuid-binary usr/lib/openssh/ssh-keysign 4755 root/root | |||
diff --git a/debian/openssh-client.manpages b/debian/openssh-client.manpages new file mode 100644 index 000000000..690bd8a22 --- /dev/null +++ b/debian/openssh-client.manpages | |||
@@ -0,0 +1,2 @@ | |||
1 | contrib/ssh-copy-id.1 | ||
2 | debian/ssh-argv0.1 | ||
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst new file mode 100644 index 000000000..978b04a9b --- /dev/null +++ b/debian/openssh-client.postinst | |||
@@ -0,0 +1,46 @@ | |||
1 | #!/bin/sh | ||
2 | set -e | ||
3 | |||
4 | action="$1" | ||
5 | oldversion="$2" | ||
6 | |||
7 | umask 022 | ||
8 | |||
9 | |||
10 | create_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 | |||
27 | set_ssh_agent_permissions() { | ||
28 | if ! getent group ssh >/dev/null; then | ||
29 | addgroup --system --quiet ssh | ||
30 | fi | ||
31 | if ! [ -x /usr/sbin/dpkg-statoverride ] || \ | ||
32 | ! dpkg-statoverride --list /usr/bin/ssh-agent >/dev/null ; then | ||
33 | chgrp ssh /usr/bin/ssh-agent | ||
34 | chmod 2755 /usr/bin/ssh-agent | ||
35 | fi | ||
36 | } | ||
37 | |||
38 | |||
39 | if [ "$action" = configure ]; then | ||
40 | create_alternatives | ||
41 | set_ssh_agent_permissions | ||
42 | fi | ||
43 | |||
44 | #DEBHELPER# | ||
45 | |||
46 | exit 0 | ||
diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm new file mode 100644 index 000000000..a3b610ed1 --- /dev/null +++ b/debian/openssh-client.postrm | |||
@@ -0,0 +1,22 @@ | |||
1 | #!/bin/sh | ||
2 | set -e | ||
3 | |||
4 | #DEBHELPER# | ||
5 | |||
6 | case $1 in | ||
7 | purge) | ||
8 | # Remove all non-conffiles that ssh might create, so that we | ||
9 | # can smoothly remove /etc/ssh if and only if the user | ||
10 | # hasn't dropped some other files in there. Conffiles have | ||
11 | # already been removed at this point. | ||
12 | rm -f /etc/ssh/moduli /etc/ssh/primes | ||
13 | rm -f /etc/ssh/ssh_known_hosts /etc/ssh/ssh_known_hosts2 | ||
14 | rmdir --ignore-fail-on-non-empty /etc/ssh | ||
15 | |||
16 | if which delgroup; then | ||
17 | delgroup --quiet ssh > /dev/null || true | ||
18 | fi | ||
19 | ;; | ||
20 | esac | ||
21 | |||
22 | exit 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 | |||
6 | set -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 | |||
18 | case "$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 | ;; | ||
32 | esac | ||
33 | |||
34 | # dh_installdeb will replace this with shell code automatically | ||
35 | # generated by other debhelper scripts. | ||
36 | |||
37 | #DEBHELPER# | ||
38 | |||
39 | exit 0 | ||
diff --git a/debian/openssh-server-udeb.dirs b/debian/openssh-server-udeb.dirs new file mode 100644 index 000000000..f2b0bd9da --- /dev/null +++ b/debian/openssh-server-udeb.dirs | |||
@@ -0,0 +1,3 @@ | |||
1 | usr/bin | ||
2 | usr/sbin | ||
3 | var/run/sshd | ||
diff --git a/debian/openssh-server-udeb.install b/debian/openssh-server-udeb.install new file mode 100644 index 000000000..05ccbf7af --- /dev/null +++ b/debian/openssh-server-udeb.install | |||
@@ -0,0 +1,2 @@ | |||
1 | sshd usr/sbin | ||
2 | ssh-keygen usr/bin | ||
diff --git a/debian/openssh-server.apport b/debian/openssh-server.apport new file mode 100644 index 000000000..3644bd855 --- /dev/null +++ b/debian/openssh-server.apport | |||
@@ -0,0 +1,28 @@ | |||
1 | #!/usr/bin/python | ||
2 | |||
3 | '''apport hook for openssh-server | ||
4 | |||
5 | (c) 2010 Canonical Ltd. | ||
6 | Author: Chuck Short <chuck.short@canonical.com> | ||
7 | |||
8 | This program is free software; you can redistribute it and/or modify it | ||
9 | under the terms of the GNU General Public License as published by the | ||
10 | Free Software Foundation; either version 2 of the License, or (at your | ||
11 | option) any later version. See http://www.gnu.org/copyleft/gpl.html for | ||
12 | the full text of the license. | ||
13 | ''' | ||
14 | |||
15 | from apport.hookutils import * | ||
16 | |||
17 | def add_info(report, ui): | ||
18 | response = ui.yesno("The contents of your /etc/ssh/sshd_config file " | ||
19 | "may help developers diagnose your bug more " | ||
20 | "quickly. However, it may contain sensitive " | ||
21 | "information. Do you want to include it in your " | ||
22 | "bug report?") | ||
23 | |||
24 | if response == None: # user cancelled | ||
25 | raise StopIteration | ||
26 | |||
27 | elif response == True: | ||
28 | report['SSHDConfig'] = root_command_output(['/usr/sbin/sshd', '-T']) | ||
diff --git a/debian/openssh-server.dirs b/debian/openssh-server.dirs new file mode 100644 index 000000000..7a3743680 --- /dev/null +++ b/debian/openssh-server.dirs | |||
@@ -0,0 +1,9 @@ | |||
1 | etc/init.d | ||
2 | etc/default | ||
3 | etc/network/if-up.d | ||
4 | etc/ufw/applications.d | ||
5 | usr/lib/openssh | ||
6 | usr/sbin | ||
7 | usr/share/apport/package-hooks | ||
8 | usr/share/man/man5 | ||
9 | usr/share/man/man8 | ||
diff --git a/debian/openssh-server.examples b/debian/openssh-server.examples new file mode 100644 index 000000000..0d0e55a7a --- /dev/null +++ b/debian/openssh-server.examples | |||
@@ -0,0 +1 @@ | |||
sshd_config | |||
diff --git a/debian/openssh-server.if-up b/debian/openssh-server.if-up new file mode 100644 index 000000000..de92866e6 --- /dev/null +++ b/debian/openssh-server.if-up | |||
@@ -0,0 +1,37 @@ | |||
1 | #! /bin/sh | ||
2 | # Reload the OpenSSH server when an interface comes up, to allow it to start | ||
3 | # listening on new addresses. | ||
4 | |||
5 | set -e | ||
6 | |||
7 | # Don't bother to restart sshd when lo is configured. | ||
8 | if [ "$IFACE" = lo ]; then | ||
9 | exit 0 | ||
10 | fi | ||
11 | |||
12 | # Only run from ifup. | ||
13 | if [ "$MODE" != start ]; then | ||
14 | exit 0 | ||
15 | fi | ||
16 | |||
17 | # OpenSSH only cares about inet and inet6. Get ye gone, strange people | ||
18 | # still using ipx. | ||
19 | if [ "$ADDRFAM" != inet ] && [ "$ADDRFAM" != inet6 ]; then | ||
20 | exit 0 | ||
21 | fi | ||
22 | |||
23 | # Is /usr mounted? | ||
24 | if [ ! -e /usr/sbin/sshd ]; then | ||
25 | exit 0 | ||
26 | fi | ||
27 | |||
28 | if [ ! -f /var/run/sshd.pid ] || \ | ||
29 | [ "$(ps -p "$(cat /var/run/sshd.pid)" -o comm=)" != sshd ]; then | ||
30 | exit 0 | ||
31 | fi | ||
32 | |||
33 | # We'd like to use 'reload' here, but it has some problems; see | ||
34 | # #502444. | ||
35 | invoke-rc.d ssh restart >/dev/null 2>&1 || true | ||
36 | |||
37 | exit 0 | ||
diff --git a/debian/openssh-server.install b/debian/openssh-server.install new file mode 100644 index 000000000..d04788cca --- /dev/null +++ b/debian/openssh-server.install | |||
@@ -0,0 +1,10 @@ | |||
1 | usr/lib/openssh/sftp-server | ||
2 | usr/sbin/sshd | ||
3 | usr/share/man/man5/authorized_keys.5 | ||
4 | usr/share/man/man5/sshd_config.5 | ||
5 | usr/share/man/man8/sftp-server.8 | ||
6 | usr/share/man/man8/sshd.8 | ||
7 | |||
8 | debian/systemd/ssh.socket lib/systemd/system | ||
9 | debian/systemd/ssh@.service lib/systemd/system | ||
10 | debian/systemd/sshd.conf usr/lib/tmpfiles.d | ||
diff --git a/debian/openssh-server.links b/debian/openssh-server.links new file mode 100644 index 000000000..2d98b1dcb --- /dev/null +++ b/debian/openssh-server.links | |||
@@ -0,0 +1 @@ | |||
usr/lib/openssh/sftp-server usr/lib/sftp-server | |||
diff --git a/debian/openssh-server.lintian-overrides b/debian/openssh-server.lintian-overrides new file mode 100644 index 000000000..17d912cb0 --- /dev/null +++ b/debian/openssh-server.lintian-overrides | |||
@@ -0,0 +1 @@ | |||
openssh-server: package-contains-empty-directory usr/share/doc/openssh-client/ | |||
diff --git a/debian/openssh-server.maintscript b/debian/openssh-server.maintscript new file mode 100644 index 000000000..f9e3c4d53 --- /dev/null +++ b/debian/openssh-server.maintscript | |||
@@ -0,0 +1 @@ | |||
mv_conffile /etc/pam.d/ssh /etc/pam.d/sshd 1:4.7p1-4~ | |||
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst new file mode 100644 index 000000000..72200604e --- /dev/null +++ b/debian/openssh-server.postinst | |||
@@ -0,0 +1,326 @@ | |||
1 | #!/bin/sh | ||
2 | set -e | ||
3 | |||
4 | action="$1" | ||
5 | oldversion="$2" | ||
6 | |||
7 | umask 022 | ||
8 | |||
9 | |||
10 | get_config_option() { | ||
11 | option="$1" | ||
12 | |||
13 | [ -f /etc/ssh/sshd_config ] || return | ||
14 | |||
15 | # TODO: actually only one '=' allowed after option | ||
16 | perl -lne 's/\s+/ /g; print if s/^\s*'"$option"'[[:space:]=]+//i' \ | ||
17 | /etc/ssh/sshd_config | ||
18 | } | ||
19 | |||
20 | |||
21 | set_config_option() { | ||
22 | option="$1" | ||
23 | value="$2" | ||
24 | |||
25 | perl -le ' | ||
26 | $option = $ARGV[0]; $value = $ARGV[1]; $done = 0; | ||
27 | while (<STDIN>) { | ||
28 | chomp; | ||
29 | (my $match = $_) =~ s/\s+/ /g; | ||
30 | if ($match =~ s/^\s*\Q$option\E\s+.*/$option $value/) { | ||
31 | $_ = $match; | ||
32 | $done = 1; | ||
33 | } | ||
34 | print; | ||
35 | } | ||
36 | print "$option $value" unless $done;' \ | ||
37 | "$option" "$value" \ | ||
38 | < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new | ||
39 | chown --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new | ||
40 | chmod --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new | ||
41 | mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config | ||
42 | } | ||
43 | |||
44 | |||
45 | rename_config_option() { | ||
46 | oldoption="$1" | ||
47 | newoption="$2" | ||
48 | |||
49 | value="$(get_config_option "$oldoption")" | ||
50 | [ "$value" ] || return 0 | ||
51 | |||
52 | perl -le ' | ||
53 | $oldoption = $ARGV[0]; $newoption = $ARGV[1]; | ||
54 | while (<STDIN>) { | ||
55 | chomp; | ||
56 | (my $match = $_) =~ s/\s+/ /g; | ||
57 | # TODO: actually only one "=" allowed after option | ||
58 | if ($match =~ s/^(\s*)\Q$oldoption\E([[:space:]=]+)/$1$newoption$2/i) { | ||
59 | $_ = $match; | ||
60 | } | ||
61 | print; | ||
62 | }' \ | ||
63 | "$oldoption" "$newoption" \ | ||
64 | < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new | ||
65 | chown --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new | ||
66 | chmod --reference /etc/ssh/sshd_config /etc/ssh/sshd_config.dpkg-new | ||
67 | mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config | ||
68 | } | ||
69 | |||
70 | |||
71 | host_keys_required() { | ||
72 | hostkeys="$(get_config_option HostKey)" | ||
73 | if [ "$hostkeys" ]; then | ||
74 | echo "$hostkeys" | ||
75 | else | ||
76 | # No HostKey directives at all, so the server picks some | ||
77 | # defaults depending on the setting of Protocol. | ||
78 | protocol="$(get_config_option Protocol)" | ||
79 | [ "$protocol" ] || protocol=1,2 | ||
80 | if echo "$protocol" | grep 1 >/dev/null; then | ||
81 | echo /etc/ssh/ssh_host_key | ||
82 | fi | ||
83 | if echo "$protocol" | grep 2 >/dev/null; then | ||
84 | echo /etc/ssh/ssh_host_rsa_key | ||
85 | echo /etc/ssh/ssh_host_dsa_key | ||
86 | echo /etc/ssh/ssh_host_ecdsa_key | ||
87 | echo /etc/ssh/ssh_host_ed25519_key | ||
88 | fi | ||
89 | fi | ||
90 | } | ||
91 | |||
92 | |||
93 | create_key() { | ||
94 | msg="$1" | ||
95 | shift | ||
96 | hostkeys="$1" | ||
97 | shift | ||
98 | file="$1" | ||
99 | shift | ||
100 | |||
101 | if echo "$hostkeys" | grep -x "$file" >/dev/null && \ | ||
102 | [ ! -f "$file" ] ; then | ||
103 | echo -n $msg | ||
104 | ssh-keygen -q -f "$file" -N '' "$@" | ||
105 | echo | ||
106 | if which restorecon >/dev/null 2>&1; then | ||
107 | restorecon "$file" "$file.pub" | ||
108 | fi | ||
109 | fi | ||
110 | } | ||
111 | |||
112 | |||
113 | create_keys() { | ||
114 | hostkeys="$(host_keys_required)" | ||
115 | |||
116 | create_key "Creating SSH1 key; this may take some time ..." \ | ||
117 | "$hostkeys" /etc/ssh/ssh_host_key -t rsa1 | ||
118 | |||
119 | create_key "Creating SSH2 RSA key; this may take some time ..." \ | ||
120 | "$hostkeys" /etc/ssh/ssh_host_rsa_key -t rsa | ||
121 | create_key "Creating SSH2 DSA key; this may take some time ..." \ | ||
122 | "$hostkeys" /etc/ssh/ssh_host_dsa_key -t dsa | ||
123 | create_key "Creating SSH2 ECDSA key; this may take some time ..." \ | ||
124 | "$hostkeys" /etc/ssh/ssh_host_ecdsa_key -t ecdsa | ||
125 | create_key "Creating SSH2 ED25519 key; this may take some time ..." \ | ||
126 | "$hostkeys" /etc/ssh/ssh_host_ed25519_key -t ed25519 | ||
127 | } | ||
128 | |||
129 | |||
130 | fix_loglevel_silent() { | ||
131 | if [ "$(get_config_option LogLevel)" = SILENT ]; then | ||
132 | set_config_option LogLevel QUIET | ||
133 | fi | ||
134 | } | ||
135 | |||
136 | |||
137 | update_server_key_bits() { | ||
138 | if [ "$(get_config_option ServerKeyBits)" = 768 ]; then | ||
139 | set_config_option ServerKeyBits 1024 | ||
140 | fi | ||
141 | } | ||
142 | |||
143 | |||
144 | create_sshdconfig() { | ||
145 | if [ -e /etc/ssh/sshd_config ] ; then | ||
146 | # Upgrade an existing sshd configuration. | ||
147 | |||
148 | # This option was renamed in 3.8p1, but we never took care | ||
149 | # of adjusting the configuration file until now. | ||
150 | if dpkg --compare-versions "$oldversion" lt 1:4.7p1-8; then | ||
151 | rename_config_option KeepAlive TCPKeepAlive | ||
152 | fi | ||
153 | |||
154 | # 'LogLevel SILENT' is now equivalent to QUIET. | ||
155 | if dpkg --compare-versions "$oldversion" lt 1:5.4p1-1; then | ||
156 | fix_loglevel_silent | ||
157 | fi | ||
158 | |||
159 | # Changed upstream in 5.1p1, but we forgot to update the | ||
160 | # package-generated configuration file until now. | ||
161 | if dpkg --compare-versions "$oldversion" lt 1:6.4p1-2; then | ||
162 | update_server_key_bits | ||
163 | fi | ||
164 | |||
165 | return 0 | ||
166 | fi | ||
167 | |||
168 | cat <<EOF > /etc/ssh/sshd_config | ||
169 | # Package generated configuration file | ||
170 | # See the sshd_config(5) manpage for details | ||
171 | |||
172 | # What ports, IPs and protocols we listen for | ||
173 | Port 22 | ||
174 | # Use these options to restrict which interfaces/protocols sshd will bind to | ||
175 | #ListenAddress :: | ||
176 | #ListenAddress 0.0.0.0 | ||
177 | Protocol 2 | ||
178 | # HostKeys for protocol version 2 | ||
179 | HostKey /etc/ssh/ssh_host_rsa_key | ||
180 | HostKey /etc/ssh/ssh_host_dsa_key | ||
181 | HostKey /etc/ssh/ssh_host_ecdsa_key | ||
182 | HostKey /etc/ssh/ssh_host_ed25519_key | ||
183 | #Privilege Separation is turned on for security | ||
184 | UsePrivilegeSeparation yes | ||
185 | |||
186 | # Lifetime and size of ephemeral version 1 server key | ||
187 | KeyRegenerationInterval 3600 | ||
188 | ServerKeyBits 1024 | ||
189 | |||
190 | # Logging | ||
191 | SyslogFacility AUTH | ||
192 | LogLevel INFO | ||
193 | |||
194 | # Authentication: | ||
195 | LoginGraceTime 120 | ||
196 | PermitRootLogin yes | ||
197 | StrictModes yes | ||
198 | |||
199 | RSAAuthentication yes | ||
200 | PubkeyAuthentication yes | ||
201 | #AuthorizedKeysFile %h/.ssh/authorized_keys | ||
202 | |||
203 | # Don't read the user's ~/.rhosts and ~/.shosts files | ||
204 | IgnoreRhosts yes | ||
205 | # For this to work you will also need host keys in /etc/ssh_known_hosts | ||
206 | RhostsRSAAuthentication no | ||
207 | # similar for protocol version 2 | ||
208 | HostbasedAuthentication no | ||
209 | # Uncomment if you don't trust ~/.ssh/known_hosts for RhostsRSAAuthentication | ||
210 | #IgnoreUserKnownHosts yes | ||
211 | |||
212 | # To enable empty passwords, change to yes (NOT RECOMMENDED) | ||
213 | PermitEmptyPasswords no | ||
214 | |||
215 | # Change to yes to enable challenge-response passwords (beware issues with | ||
216 | # some PAM modules and threads) | ||
217 | ChallengeResponseAuthentication no | ||
218 | |||
219 | # Change to no to disable tunnelled clear text passwords | ||
220 | #PasswordAuthentication yes | ||
221 | |||
222 | # Kerberos options | ||
223 | #KerberosAuthentication no | ||
224 | #KerberosGetAFSToken no | ||
225 | #KerberosOrLocalPasswd yes | ||
226 | #KerberosTicketCleanup yes | ||
227 | |||
228 | # GSSAPI options | ||
229 | #GSSAPIAuthentication no | ||
230 | #GSSAPICleanupCredentials yes | ||
231 | |||
232 | X11Forwarding yes | ||
233 | X11DisplayOffset 10 | ||
234 | PrintMotd no | ||
235 | PrintLastLog yes | ||
236 | TCPKeepAlive yes | ||
237 | #UseLogin no | ||
238 | |||
239 | #MaxStartups 10:30:60 | ||
240 | #Banner /etc/issue.net | ||
241 | |||
242 | # Allow client to pass locale environment variables | ||
243 | AcceptEnv LANG LC_* | ||
244 | |||
245 | Subsystem sftp /usr/lib/openssh/sftp-server | ||
246 | |||
247 | # Set this to 'yes' to enable PAM authentication, account processing, | ||
248 | # and session processing. If this is enabled, PAM authentication will | ||
249 | # be allowed through the ChallengeResponseAuthentication and | ||
250 | # PasswordAuthentication. Depending on your PAM configuration, | ||
251 | # PAM authentication via ChallengeResponseAuthentication may bypass | ||
252 | # the setting of "PermitRootLogin without-password". | ||
253 | # If you just want the PAM account and session checks to run without | ||
254 | # PAM authentication, then enable this but set PasswordAuthentication | ||
255 | # and ChallengeResponseAuthentication to 'no'. | ||
256 | UsePAM yes | ||
257 | EOF | ||
258 | } | ||
259 | |||
260 | fix_statoverride() { | ||
261 | # Remove an erronous override for sshd (we should have overridden ssh) | ||
262 | if [ -x /usr/sbin/dpkg-statoverride ]; then | ||
263 | if dpkg-statoverride --list /usr/sbin/sshd >/dev/null ; then | ||
264 | dpkg-statoverride --remove /usr/sbin/sshd | ||
265 | fi | ||
266 | fi | ||
267 | } | ||
268 | |||
269 | setup_sshd_user() { | ||
270 | if ! getent passwd sshd >/dev/null; then | ||
271 | adduser --quiet --system --no-create-home --home /var/run/sshd --shell /usr/sbin/nologin sshd | ||
272 | fi | ||
273 | } | ||
274 | |||
275 | remove_old_init_links() { | ||
276 | # Yes, this only works with the SysV init script layout. I know. | ||
277 | # The important thing is that it doesn't actually *break* with | ||
278 | # file-rc ... | ||
279 | if [ -e /etc/rc2.d/S20ssh ]; then | ||
280 | update-rc.d -f ssh remove >/dev/null 2>&1 | ||
281 | fi | ||
282 | rm -f /etc/rc0.d/K??ssh /etc/rc1.d/K??ssh /etc/rc6.d/K??ssh | ||
283 | } | ||
284 | |||
285 | if [ "$action" = configure ]; then | ||
286 | create_sshdconfig | ||
287 | create_keys | ||
288 | fix_statoverride | ||
289 | setup_sshd_user | ||
290 | if dpkg --compare-versions "$2" lt 1:5.2p1-1; then | ||
291 | remove_old_init_links | ||
292 | fi | ||
293 | # Renamed to /etc/ssh/moduli in 2.9.9 (!) | ||
294 | if dpkg --compare-versions "$2" lt 1:4.7p1-1; then | ||
295 | rm -f /etc/ssh/primes | ||
296 | fi | ||
297 | if dpkg --compare-versions "$2" lt 1:5.5p1-6; then | ||
298 | rm -f /var/run/sshd/.placeholder | ||
299 | fi | ||
300 | if dpkg --compare-versions "$2" lt 1:6.2p2-3 && \ | ||
301 | which initctl >/dev/null && initctl version | grep -q upstart && \ | ||
302 | ! status ssh 2>/dev/null | grep -q ' start/'; then | ||
303 | # We must stop the sysvinit-controlled sshd before we can | ||
304 | # restart it under Upstart. | ||
305 | start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true | ||
306 | fi | ||
307 | if dpkg --compare-versions "$2" lt 1:6.5p1-1 && \ | ||
308 | [ -d /run/systemd/system ] && \ | ||
309 | ! systemctl --quiet is-active ssh; then | ||
310 | # We must stop the sysvinit-controlled sshd before we can | ||
311 | # restart it under systemd. | ||
312 | start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid || true | ||
313 | fi | ||
314 | if dpkg --compare-versions "$2" lt 1:6.5p1-2 && \ | ||
315 | deb-systemd-helper debian-installed ssh.socket && \ | ||
316 | deb-systemd-helper --quiet was-enabled ssh.service && \ | ||
317 | deb-systemd-helper --quiet was-enabled ssh.socket; then | ||
318 | # 1:6.5p1-1 mistakenly left both ssh.service and ssh.socket | ||
319 | # enabled. | ||
320 | deb-systemd-helper disable ssh.socket >/dev/null || true | ||
321 | fi | ||
322 | fi | ||
323 | |||
324 | #DEBHELPER# | ||
325 | |||
326 | exit 0 | ||
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm new file mode 100644 index 000000000..88e28a91e --- /dev/null +++ b/debian/openssh-server.postrm | |||
@@ -0,0 +1,27 @@ | |||
1 | #!/bin/sh | ||
2 | set -e | ||
3 | |||
4 | #DEBHELPER# | ||
5 | |||
6 | case $1 in | ||
7 | purge) | ||
8 | # Remove all non-conffiles that ssh might create, so that we | ||
9 | # can smoothly remove /etc/ssh if and only if the user | ||
10 | # hasn't dropped some other files in there. Conffiles have | ||
11 | # already been removed at this point. | ||
12 | rm -f /etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.pub | ||
13 | rm -f /etc/ssh/ssh_host_rsa_key /etc/ssh/ssh_host_rsa_key.pub | ||
14 | rm -f /etc/ssh/ssh_host_dsa_key /etc/ssh/ssh_host_dsa_key.pub | ||
15 | rm -f /etc/ssh/ssh_host_ecdsa_key /etc/ssh/ssh_host_ecdsa_key.pub | ||
16 | rm -f /etc/ssh/ssh_host_ed25519_key /etc/ssh/ssh_host_ed25519_key.pub | ||
17 | rm -f /etc/ssh/sshd_config | ||
18 | rm -f /etc/ssh/sshd_not_to_be_run | ||
19 | rmdir --ignore-fail-on-non-empty /etc/ssh | ||
20 | |||
21 | if which deluser >/dev/null 2>&1; then | ||
22 | deluser --quiet sshd > /dev/null || true | ||
23 | fi | ||
24 | ;; | ||
25 | esac | ||
26 | |||
27 | exit 0 | ||
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst new file mode 100644 index 000000000..9fb5d350e --- /dev/null +++ b/debian/openssh-server.preinst | |||
@@ -0,0 +1,18 @@ | |||
1 | #!/bin/sh | ||
2 | set -e | ||
3 | |||
4 | action=$1 | ||
5 | version=$2 | ||
6 | |||
7 | if [ "$action" = upgrade ] || [ "$action" = install ] | ||
8 | then | ||
9 | if dpkg --compare-versions "$version" lt 1:5.5p1-6 && \ | ||
10 | [ -d /var/run/sshd ]; then | ||
11 | # make sure /var/run/sshd is not removed on upgrades | ||
12 | touch /var/run/sshd/.placeholder | ||
13 | fi | ||
14 | fi | ||
15 | |||
16 | #DEBHELPER# | ||
17 | |||
18 | exit 0 | ||
diff --git a/debian/openssh-server.ssh.default b/debian/openssh-server.ssh.default new file mode 100644 index 000000000..304042224 --- /dev/null +++ b/debian/openssh-server.ssh.default | |||
@@ -0,0 +1,5 @@ | |||
1 | # Default settings for openssh-server. This file is sourced by /bin/sh from | ||
2 | # /etc/init.d/ssh. | ||
3 | |||
4 | # Options to pass to sshd | ||
5 | SSHD_OPTS= | ||
diff --git a/debian/openssh-server.ssh.init b/debian/openssh-server.ssh.init new file mode 100644 index 000000000..bda7a92b8 --- /dev/null +++ b/debian/openssh-server.ssh.init | |||
@@ -0,0 +1,174 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | ### BEGIN INIT INFO | ||
4 | # Provides: sshd | ||
5 | # Required-Start: $remote_fs $syslog | ||
6 | # Required-Stop: $remote_fs $syslog | ||
7 | # Default-Start: 2 3 4 5 | ||
8 | # Default-Stop: | ||
9 | # Short-Description: OpenBSD Secure Shell server | ||
10 | ### END INIT INFO | ||
11 | |||
12 | set -e | ||
13 | |||
14 | # /etc/init.d/ssh: start and stop the OpenBSD "secure shell(tm)" daemon | ||
15 | |||
16 | test -x /usr/sbin/sshd || exit 0 | ||
17 | ( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0 | ||
18 | |||
19 | umask 022 | ||
20 | |||
21 | if test -f /etc/default/ssh; then | ||
22 | . /etc/default/ssh | ||
23 | fi | ||
24 | |||
25 | . /lib/lsb/init-functions | ||
26 | |||
27 | if [ -n "$2" ]; then | ||
28 | SSHD_OPTS="$SSHD_OPTS $2" | ||
29 | fi | ||
30 | |||
31 | # Are we running from init? | ||
32 | run_by_init() { | ||
33 | ([ "$previous" ] && [ "$runlevel" ]) || [ "$runlevel" = S ] | ||
34 | } | ||
35 | |||
36 | check_for_upstart() { | ||
37 | if init_is_upstart; then | ||
38 | exit $1 | ||
39 | fi | ||
40 | } | ||
41 | |||
42 | check_for_no_start() { | ||
43 | # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists | ||
44 | if [ -e /etc/ssh/sshd_not_to_be_run ]; then | ||
45 | if [ "$1" = log_end_msg ]; then | ||
46 | log_end_msg 0 || true | ||
47 | fi | ||
48 | if ! run_by_init; then | ||
49 | log_action_msg "OpenBSD Secure Shell server not in use (/etc/ssh/sshd_not_to_be_run)" || true | ||
50 | fi | ||
51 | exit 0 | ||
52 | fi | ||
53 | } | ||
54 | |||
55 | check_dev_null() { | ||
56 | if [ ! -c /dev/null ]; then | ||
57 | if [ "$1" = log_end_msg ]; then | ||
58 | log_end_msg 1 || true | ||
59 | fi | ||
60 | if ! run_by_init; then | ||
61 | log_action_msg "/dev/null is not a character device!" || true | ||
62 | fi | ||
63 | exit 1 | ||
64 | fi | ||
65 | } | ||
66 | |||
67 | check_privsep_dir() { | ||
68 | # Create the PrivSep empty dir if necessary | ||
69 | if [ ! -d /var/run/sshd ]; then | ||
70 | mkdir /var/run/sshd | ||
71 | chmod 0755 /var/run/sshd | ||
72 | fi | ||
73 | } | ||
74 | |||
75 | check_config() { | ||
76 | if [ ! -e /etc/ssh/sshd_not_to_be_run ]; then | ||
77 | /usr/sbin/sshd $SSHD_OPTS -t || exit 1 | ||
78 | fi | ||
79 | } | ||
80 | |||
81 | export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" | ||
82 | |||
83 | case "$1" in | ||
84 | start) | ||
85 | check_for_upstart 1 | ||
86 | check_privsep_dir | ||
87 | check_for_no_start | ||
88 | check_dev_null | ||
89 | log_daemon_msg "Starting OpenBSD Secure Shell server" "sshd" || true | ||
90 | if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then | ||
91 | log_end_msg 0 || true | ||
92 | else | ||
93 | log_end_msg 1 || true | ||
94 | fi | ||
95 | ;; | ||
96 | stop) | ||
97 | check_for_upstart 0 | ||
98 | log_daemon_msg "Stopping OpenBSD Secure Shell server" "sshd" || true | ||
99 | if start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/sshd.pid; then | ||
100 | log_end_msg 0 || true | ||
101 | else | ||
102 | log_end_msg 1 || true | ||
103 | fi | ||
104 | ;; | ||
105 | |||
106 | reload|force-reload) | ||
107 | check_for_upstart 1 | ||
108 | check_for_no_start | ||
109 | check_config | ||
110 | log_daemon_msg "Reloading OpenBSD Secure Shell server's configuration" "sshd" || true | ||
111 | if start-stop-daemon --stop --signal 1 --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd; then | ||
112 | log_end_msg 0 || true | ||
113 | else | ||
114 | log_end_msg 1 || true | ||
115 | fi | ||
116 | ;; | ||
117 | |||
118 | restart) | ||
119 | check_for_upstart 1 | ||
120 | check_privsep_dir | ||
121 | check_config | ||
122 | log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true | ||
123 | start-stop-daemon --stop --quiet --oknodo --retry 30 --pidfile /var/run/sshd.pid | ||
124 | check_for_no_start log_end_msg | ||
125 | check_dev_null log_end_msg | ||
126 | if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then | ||
127 | log_end_msg 0 || true | ||
128 | else | ||
129 | log_end_msg 1 || true | ||
130 | fi | ||
131 | ;; | ||
132 | |||
133 | try-restart) | ||
134 | check_for_upstart 1 | ||
135 | check_privsep_dir | ||
136 | check_config | ||
137 | log_daemon_msg "Restarting OpenBSD Secure Shell server" "sshd" || true | ||
138 | RET=0 | ||
139 | start-stop-daemon --stop --quiet --retry 30 --pidfile /var/run/sshd.pid || RET="$?" | ||
140 | case $RET in | ||
141 | 0) | ||
142 | # old daemon stopped | ||
143 | check_for_no_start log_end_msg | ||
144 | check_dev_null log_end_msg | ||
145 | if start-stop-daemon --start --quiet --oknodo --pidfile /var/run/sshd.pid --exec /usr/sbin/sshd -- $SSHD_OPTS; then | ||
146 | log_end_msg 0 || true | ||
147 | else | ||
148 | log_end_msg 1 || true | ||
149 | fi | ||
150 | ;; | ||
151 | 1) | ||
152 | # daemon not running | ||
153 | log_progress_msg "(not running)" || true | ||
154 | log_end_msg 0 || true | ||
155 | ;; | ||
156 | *) | ||
157 | # failed to stop | ||
158 | log_progress_msg "(failed to stop)" || true | ||
159 | log_end_msg 1 || true | ||
160 | ;; | ||
161 | esac | ||
162 | ;; | ||
163 | |||
164 | status) | ||
165 | check_for_upstart 1 | ||
166 | status_of_proc -p /var/run/sshd.pid /usr/sbin/sshd sshd && exit 0 || exit $? | ||
167 | ;; | ||
168 | |||
169 | *) | ||
170 | log_action_msg "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart|try-restart|status}" || true | ||
171 | exit 1 | ||
172 | esac | ||
173 | |||
174 | exit 0 | ||
diff --git a/debian/openssh-server.ssh.service b/debian/openssh-server.ssh.service new file mode 120000 index 000000000..609457230 --- /dev/null +++ b/debian/openssh-server.ssh.service | |||
@@ -0,0 +1 @@ | |||
systemd/ssh.service \ No newline at end of file | |||
diff --git a/debian/openssh-server.ssh.upstart b/debian/openssh-server.ssh.upstart new file mode 100644 index 000000000..10ab744f1 --- /dev/null +++ b/debian/openssh-server.ssh.upstart | |||
@@ -0,0 +1,30 @@ | |||
1 | # ssh - OpenBSD Secure Shell server | ||
2 | # | ||
3 | # The OpenSSH server provides secure shell access to the system. | ||
4 | |||
5 | description "OpenSSH server" | ||
6 | |||
7 | start on runlevel [2345] | ||
8 | stop on runlevel [!2345] | ||
9 | |||
10 | respawn | ||
11 | respawn limit 10 5 | ||
12 | umask 022 | ||
13 | |||
14 | env SSH_SIGSTOP=1 | ||
15 | expect stop | ||
16 | |||
17 | # 'sshd -D' leaks stderr and confuses things in conjunction with 'console log' | ||
18 | console none | ||
19 | |||
20 | pre-start script | ||
21 | test -x /usr/sbin/sshd || { stop; exit 0; } | ||
22 | test -e /etc/ssh/sshd_not_to_be_run && { stop; exit 0; } | ||
23 | test -c /dev/null || { stop; exit 0; } | ||
24 | |||
25 | mkdir -p -m0755 /var/run/sshd | ||
26 | end script | ||
27 | |||
28 | # if you used to set SSHD_OPTS in /etc/default/ssh, you can change the | ||
29 | # 'exec' line here instead | ||
30 | exec /usr/sbin/sshd -D | ||
diff --git a/debian/openssh-server.sshd.pam b/debian/openssh-server.sshd.pam new file mode 100644 index 000000000..7978b0c64 --- /dev/null +++ b/debian/openssh-server.sshd.pam | |||
@@ -0,0 +1,55 @@ | |||
1 | # PAM configuration for the Secure Shell service | ||
2 | |||
3 | # Standard Un*x authentication. | ||
4 | @include common-auth | ||
5 | |||
6 | # Disallow non-root logins when /etc/nologin exists. | ||
7 | account 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. | ||
19 | session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close | ||
20 | |||
21 | # Set the loginuid process attribute. | ||
22 | session required pam_loginuid.so | ||
23 | |||
24 | # Create a new session keyring. | ||
25 | 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. | ||
33 | session optional pam_motd.so motd=/run/motd.dynamic noupdate | ||
34 | session optional pam_motd.so # [1] | ||
35 | |||
36 | # Print the status of the user's mailbox upon successful login. | ||
37 | session optional pam_mail.so standard noenv # [1] | ||
38 | |||
39 | # Set up user limits from /etc/security/limits.conf. | ||
40 | session required pam_limits.so | ||
41 | |||
42 | # Read environment variables from /etc/environment and | ||
43 | # /etc/security/pam_env.conf. | ||
44 | session 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. | ||
47 | session 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. | ||
52 | session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open | ||
53 | |||
54 | # Standard Un*x password updating. | ||
55 | @include common-password | ||
diff --git a/debian/openssh-server.ufw.profile b/debian/openssh-server.ufw.profile new file mode 100644 index 000000000..9bbe906bc --- /dev/null +++ b/debian/openssh-server.ufw.profile | |||
@@ -0,0 +1,4 @@ | |||
1 | [OpenSSH] | ||
2 | title=Secure shell server, an rshd replacement | ||
3 | description=OpenSSH is a free implementation of the Secure Shell protocol. | ||
4 | ports=22/tcp | ||
diff --git a/debian/patches/auth-log-verbosity.patch b/debian/patches/auth-log-verbosity.patch new file mode 100644 index 000000000..c91cdbd68 --- /dev/null +++ b/debian/patches/auth-log-verbosity.patch | |||
@@ -0,0 +1,133 @@ | |||
1 | From 493e37552aa05b38cf69b5f1bc4b717fd4a1a285 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:02 +0000 | ||
4 | Subject: Quieten logs when multiple from= restrictions are used | ||
5 | |||
6 | Bug-Debian: http://bugs.debian.org/630606 | ||
7 | Forwarded: no | ||
8 | Last-Update: 2013-09-14 | ||
9 | |||
10 | Patch-Name: auth-log-verbosity.patch | ||
11 | --- | ||
12 | auth-options.c | 35 ++++++++++++++++++++++++++--------- | ||
13 | auth-options.h | 1 + | ||
14 | auth-rsa.c | 2 ++ | ||
15 | auth2-pubkey.c | 3 +++ | ||
16 | 4 files changed, 32 insertions(+), 9 deletions(-) | ||
17 | |||
18 | diff --git a/auth-options.c b/auth-options.c | ||
19 | index fa209ea..df61330 100644 | ||
20 | --- a/auth-options.c | ||
21 | +++ b/auth-options.c | ||
22 | @@ -54,9 +54,20 @@ int forced_tun_device = -1; | ||
23 | /* "principals=" option. */ | ||
24 | char *authorized_principals = NULL; | ||
25 | |||
26 | +/* Throttle log messages. */ | ||
27 | +int logged_from_hostip = 0; | ||
28 | +int logged_cert_hostip = 0; | ||
29 | + | ||
30 | extern ServerOptions options; | ||
31 | |||
32 | void | ||
33 | +auth_start_parse_options(void) | ||
34 | +{ | ||
35 | + logged_from_hostip = 0; | ||
36 | + logged_cert_hostip = 0; | ||
37 | +} | ||
38 | + | ||
39 | +void | ||
40 | auth_clear_options(void) | ||
41 | { | ||
42 | no_agent_forwarding_flag = 0; | ||
43 | @@ -284,10 +295,13 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum) | ||
44 | /* FALLTHROUGH */ | ||
45 | case 0: | ||
46 | free(patterns); | ||
47 | - logit("Authentication tried for %.100s with " | ||
48 | - "correct key but not from a permitted " | ||
49 | - "host (host=%.200s, ip=%.200s).", | ||
50 | - pw->pw_name, remote_host, remote_ip); | ||
51 | + if (!logged_from_hostip) { | ||
52 | + logit("Authentication tried for %.100s with " | ||
53 | + "correct key but not from a permitted " | ||
54 | + "host (host=%.200s, ip=%.200s).", | ||
55 | + pw->pw_name, remote_host, remote_ip); | ||
56 | + logged_from_hostip = 1; | ||
57 | + } | ||
58 | auth_debug_add("Your host '%.200s' is not " | ||
59 | "permitted to use this key for login.", | ||
60 | remote_host); | ||
61 | @@ -510,11 +524,14 @@ parse_option_list(u_char *optblob, size_t optblob_len, struct passwd *pw, | ||
62 | break; | ||
63 | case 0: | ||
64 | /* no match */ | ||
65 | - logit("Authentication tried for %.100s " | ||
66 | - "with valid certificate but not " | ||
67 | - "from a permitted host " | ||
68 | - "(ip=%.200s).", pw->pw_name, | ||
69 | - remote_ip); | ||
70 | + if (!logged_cert_hostip) { | ||
71 | + logit("Authentication tried for %.100s " | ||
72 | + "with valid certificate but not " | ||
73 | + "from a permitted host " | ||
74 | + "(ip=%.200s).", pw->pw_name, | ||
75 | + remote_ip); | ||
76 | + logged_cert_hostip = 1; | ||
77 | + } | ||
78 | auth_debug_add("Your address '%.200s' " | ||
79 | "is not permitted to use this " | ||
80 | "certificate for login.", | ||
81 | diff --git a/auth-options.h b/auth-options.h | ||
82 | index 7455c94..a3f0a02 100644 | ||
83 | --- a/auth-options.h | ||
84 | +++ b/auth-options.h | ||
85 | @@ -33,6 +33,7 @@ extern int forced_tun_device; | ||
86 | extern int key_is_cert_authority; | ||
87 | extern char *authorized_principals; | ||
88 | |||
89 | +void auth_start_parse_options(void); | ||
90 | int auth_parse_options(struct passwd *, char *, char *, u_long); | ||
91 | void auth_clear_options(void); | ||
92 | int auth_cert_options(Key *, struct passwd *); | ||
93 | diff --git a/auth-rsa.c b/auth-rsa.c | ||
94 | index 545aa49..4624c15 100644 | ||
95 | --- a/auth-rsa.c | ||
96 | +++ b/auth-rsa.c | ||
97 | @@ -174,6 +174,8 @@ rsa_key_allowed_in_file(struct passwd *pw, char *file, | ||
98 | if ((f = auth_openkeyfile(file, pw, options.strict_modes)) == NULL) | ||
99 | return 0; | ||
100 | |||
101 | + auth_start_parse_options(); | ||
102 | + | ||
103 | /* | ||
104 | * Go though the accepted keys, looking for the current key. If | ||
105 | * found, perform a challenge-response dialog to verify that the | ||
106 | diff --git a/auth2-pubkey.c b/auth2-pubkey.c | ||
107 | index 0fd27bb..7c56927 100644 | ||
108 | --- a/auth2-pubkey.c | ||
109 | +++ b/auth2-pubkey.c | ||
110 | @@ -263,6 +263,7 @@ match_principals_file(char *file, struct passwd *pw, struct KeyCert *cert) | ||
111 | restore_uid(); | ||
112 | return 0; | ||
113 | } | ||
114 | + auth_start_parse_options(); | ||
115 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | ||
116 | /* Skip leading whitespace. */ | ||
117 | for (cp = line; *cp == ' ' || *cp == '\t'; cp++) | ||
118 | @@ -324,6 +325,7 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw) | ||
119 | found_key = 0; | ||
120 | |||
121 | found = NULL; | ||
122 | + auth_start_parse_options(); | ||
123 | while (read_keyfile_line(f, file, line, sizeof(line), &linenum) != -1) { | ||
124 | char *cp, *key_options = NULL; | ||
125 | if (found != NULL) | ||
126 | @@ -459,6 +461,7 @@ user_cert_trusted_ca(struct passwd *pw, Key *key) | ||
127 | if (key_cert_check_authority(key, 0, 1, | ||
128 | principals_file == NULL ? pw->pw_name : NULL, &reason) != 0) | ||
129 | goto fail_reason; | ||
130 | + auth_start_parse_options(); | ||
131 | if (auth_cert_options(key, pw) != 0) | ||
132 | goto out; | ||
133 | |||
diff --git a/debian/patches/authorized-keys-man-symlink.patch b/debian/patches/authorized-keys-man-symlink.patch new file mode 100644 index 000000000..ce1b72d60 --- /dev/null +++ b/debian/patches/authorized-keys-man-symlink.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From cf559d6c8b4616022f5bedcf3b3b85387a4d1559 Mon Sep 17 00:00:00 2001 | ||
2 | From: Tomas Pospisek <tpo_deb@sourcepole.ch> | ||
3 | Date: Sun, 9 Feb 2014 16:10:07 +0000 | ||
4 | Subject: Install authorized_keys(5) as a symlink to sshd(8) | ||
5 | |||
6 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1720 | ||
7 | Bug-Debian: http://bugs.debian.org/441817 | ||
8 | Last-Update: 2013-09-14 | ||
9 | |||
10 | Patch-Name: authorized-keys-man-symlink.patch | ||
11 | --- | ||
12 | Makefile.in | 1 + | ||
13 | 1 file changed, 1 insertion(+) | ||
14 | |||
15 | diff --git a/Makefile.in b/Makefile.in | ||
16 | index 598d55a..5cf8100 100644 | ||
17 | --- a/Makefile.in | ||
18 | +++ b/Makefile.in | ||
19 | @@ -287,6 +287,7 @@ install-files: | ||
20 | $(INSTALL) -m 644 sshd_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/sshd_config.5 | ||
21 | $(INSTALL) -m 644 ssh_config.5.out $(DESTDIR)$(mandir)/$(mansubdir)5/ssh_config.5 | ||
22 | $(INSTALL) -m 644 sshd.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sshd.8 | ||
23 | + ln -s ../$(mansubdir)8/sshd.8 $(DESTDIR)$(mandir)/$(mansubdir)5/authorized_keys.5 | ||
24 | $(INSTALL) -m 644 sftp.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sftp.1 | ||
25 | $(INSTALL) -m 644 sftp-server.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/sftp-server.8 | ||
26 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | ||
diff --git a/debian/patches/consolekit.patch b/debian/patches/consolekit.patch new file mode 100644 index 000000000..65b6feb71 --- /dev/null +++ b/debian/patches/consolekit.patch | |||
@@ -0,0 +1,742 @@ | |||
1 | From efe70e315cfcc70e765ebd070e83528a6be6c125 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@ubuntu.com> | ||
3 | Date: Sun, 9 Feb 2014 16:09:57 +0000 | ||
4 | Subject: Add support for registering ConsoleKit sessions on login | ||
5 | |||
6 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1450 | ||
7 | Last-Updated: 2013-09-14 | ||
8 | |||
9 | Patch-Name: consolekit.patch | ||
10 | --- | ||
11 | Makefile.in | 3 +- | ||
12 | configure | 132 +++++++++++++++++++++++++++++++ | ||
13 | configure.ac | 25 ++++++ | ||
14 | consolekit.c | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
15 | consolekit.h | 24 ++++++ | ||
16 | monitor.c | 43 +++++++++++ | ||
17 | monitor.h | 2 + | ||
18 | monitor_wrap.c | 31 ++++++++ | ||
19 | monitor_wrap.h | 4 + | ||
20 | session.c | 13 ++++ | ||
21 | session.h | 6 ++ | ||
22 | 11 files changed, 522 insertions(+), 1 deletion(-) | ||
23 | create mode 100644 consolekit.c | ||
24 | create mode 100644 consolekit.h | ||
25 | |||
26 | diff --git a/Makefile.in b/Makefile.in | ||
27 | index 35c6fd6..598d55a 100644 | ||
28 | --- a/Makefile.in | ||
29 | +++ b/Makefile.in | ||
30 | @@ -97,7 +97,8 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | ||
31 | sftp-server.o sftp-common.o \ | ||
32 | roaming_common.o roaming_serv.o \ | ||
33 | sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \ | ||
34 | - sandbox-seccomp-filter.o sandbox-capsicum.o | ||
35 | + sandbox-seccomp-filter.o sandbox-capsicum.o \ | ||
36 | + consolekit.o | ||
37 | |||
38 | MANPAGES = moduli.5.out scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-keysign.8.out ssh-pkcs11-helper.8.out sshd_config.5.out ssh_config.5.out | ||
39 | MANPAGES_IN = moduli.5 scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-keysign.8 ssh-pkcs11-helper.8 sshd_config.5 ssh_config.5 | ||
40 | diff --git a/configure b/configure | ||
41 | index 5a9db2d..57b68e2 100755 | ||
42 | --- a/configure | ||
43 | +++ b/configure | ||
44 | @@ -740,6 +740,7 @@ with_privsep_user | ||
45 | with_sandbox | ||
46 | with_selinux | ||
47 | with_kerberos5 | ||
48 | +with_consolekit | ||
49 | with_privsep_path | ||
50 | with_xauth | ||
51 | enable_strip | ||
52 | @@ -1432,6 +1433,7 @@ Optional Packages: | ||
53 | --with-sandbox=style Specify privilege separation sandbox (no, darwin, rlimit, systrace, seccomp_filter, capsicum) | ||
54 | --with-selinux Enable SELinux support | ||
55 | --with-kerberos5=PATH Enable Kerberos 5 support | ||
56 | + --with-consolekit Enable ConsoleKit support | ||
57 | --with-privsep-path=xxx Path for privilege separation chroot (default=/var/empty) | ||
58 | --with-xauth=PATH Specify path to xauth program | ||
59 | --with-maildir=/path/to/mail Specify your system mail directory | ||
60 | @@ -17215,6 +17217,135 @@ fi | ||
61 | |||
62 | |||
63 | |||
64 | +# Check whether user wants ConsoleKit support | ||
65 | +CONSOLEKIT_MSG="no" | ||
66 | +LIBCK_CONNECTOR="" | ||
67 | + | ||
68 | +# Check whether --with-consolekit was given. | ||
69 | +if test "${with_consolekit+set}" = set; then : | ||
70 | + withval=$with_consolekit; if test "x$withval" != "xno" ; then | ||
71 | + if test -n "$ac_tool_prefix"; then | ||
72 | + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
73 | +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
74 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
75 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
76 | +if ${ac_cv_path_PKGCONFIG+:} false; then : | ||
77 | + $as_echo_n "(cached) " >&6 | ||
78 | +else | ||
79 | + case $PKGCONFIG in | ||
80 | + [\\/]* | ?:[\\/]*) | ||
81 | + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. | ||
82 | + ;; | ||
83 | + *) | ||
84 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
85 | +for as_dir in $PATH | ||
86 | +do | ||
87 | + IFS=$as_save_IFS | ||
88 | + test -z "$as_dir" && as_dir=. | ||
89 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
90 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
91 | + ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
92 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
93 | + break 2 | ||
94 | + fi | ||
95 | +done | ||
96 | + done | ||
97 | +IFS=$as_save_IFS | ||
98 | + | ||
99 | + ;; | ||
100 | +esac | ||
101 | +fi | ||
102 | +PKGCONFIG=$ac_cv_path_PKGCONFIG | ||
103 | +if test -n "$PKGCONFIG"; then | ||
104 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 | ||
105 | +$as_echo "$PKGCONFIG" >&6; } | ||
106 | +else | ||
107 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
108 | +$as_echo "no" >&6; } | ||
109 | +fi | ||
110 | + | ||
111 | + | ||
112 | +fi | ||
113 | +if test -z "$ac_cv_path_PKGCONFIG"; then | ||
114 | + ac_pt_PKGCONFIG=$PKGCONFIG | ||
115 | + # Extract the first word of "pkg-config", so it can be a program name with args. | ||
116 | +set dummy pkg-config; ac_word=$2 | ||
117 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
118 | +$as_echo_n "checking for $ac_word... " >&6; } | ||
119 | +if ${ac_cv_path_ac_pt_PKGCONFIG+:} false; then : | ||
120 | + $as_echo_n "(cached) " >&6 | ||
121 | +else | ||
122 | + case $ac_pt_PKGCONFIG in | ||
123 | + [\\/]* | ?:[\\/]*) | ||
124 | + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. | ||
125 | + ;; | ||
126 | + *) | ||
127 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
128 | +for as_dir in $PATH | ||
129 | +do | ||
130 | + IFS=$as_save_IFS | ||
131 | + test -z "$as_dir" && as_dir=. | ||
132 | + for ac_exec_ext in '' $ac_executable_extensions; do | ||
133 | + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then | ||
134 | + ac_cv_path_ac_pt_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
135 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
136 | + break 2 | ||
137 | + fi | ||
138 | +done | ||
139 | + done | ||
140 | +IFS=$as_save_IFS | ||
141 | + | ||
142 | + ;; | ||
143 | +esac | ||
144 | +fi | ||
145 | +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG | ||
146 | +if test -n "$ac_pt_PKGCONFIG"; then | ||
147 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 | ||
148 | +$as_echo "$ac_pt_PKGCONFIG" >&6; } | ||
149 | +else | ||
150 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
151 | +$as_echo "no" >&6; } | ||
152 | +fi | ||
153 | + | ||
154 | + if test "x$ac_pt_PKGCONFIG" = x; then | ||
155 | + PKGCONFIG="no" | ||
156 | + else | ||
157 | + case $cross_compiling:$ac_tool_warned in | ||
158 | +yes:) | ||
159 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
160 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
161 | +ac_tool_warned=yes ;; | ||
162 | +esac | ||
163 | + PKGCONFIG=$ac_pt_PKGCONFIG | ||
164 | + fi | ||
165 | +else | ||
166 | + PKGCONFIG="$ac_cv_path_PKGCONFIG" | ||
167 | +fi | ||
168 | + | ||
169 | + if test "$PKGCONFIG" != "no"; then | ||
170 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ck-connector" >&5 | ||
171 | +$as_echo_n "checking for ck-connector... " >&6; } | ||
172 | + if $PKGCONFIG --exists ck-connector; then | ||
173 | + CKCON_CFLAGS=`$PKGCONFIG --cflags ck-connector` | ||
174 | + CKCON_LIBS=`$PKGCONFIG --libs ck-connector` | ||
175 | + CPPFLAGS="$CPPFLAGS $CKCON_CFLAGS" | ||
176 | + SSHDLIBS="$SSHDLIBS $CKCON_LIBS" | ||
177 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
178 | +$as_echo "yes" >&6; } | ||
179 | + | ||
180 | +$as_echo "#define USE_CONSOLEKIT 1" >>confdefs.h | ||
181 | + | ||
182 | + CONSOLEKIT_MSG="yes" | ||
183 | + else | ||
184 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
185 | +$as_echo "no" >&6; } | ||
186 | + fi | ||
187 | + fi | ||
188 | + fi | ||
189 | + | ||
190 | +fi | ||
191 | + | ||
192 | + | ||
193 | # Looking for programs, paths and files | ||
194 | |||
195 | PRIVSEP_PATH=/var/empty | ||
196 | @@ -19744,6 +19875,7 @@ echo " MD5 password support: $MD5_MSG" | ||
197 | echo " libedit support: $LIBEDIT_MSG" | ||
198 | echo " Solaris process contract support: $SPC_MSG" | ||
199 | echo " Solaris project support: $SP_MSG" | ||
200 | +echo " ConsoleKit support: $CONSOLEKIT_MSG" | ||
201 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" | ||
202 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" | ||
203 | echo " BSD Auth support: $BSD_AUTH_MSG" | ||
204 | diff --git a/configure.ac b/configure.ac | ||
205 | index 90eebf5..e2289cd 100644 | ||
206 | --- a/configure.ac | ||
207 | +++ b/configure.ac | ||
208 | @@ -4070,6 +4070,30 @@ AC_ARG_WITH([kerberos5], | ||
209 | AC_SUBST([GSSLIBS]) | ||
210 | AC_SUBST([K5LIBS]) | ||
211 | |||
212 | +# Check whether user wants ConsoleKit support | ||
213 | +CONSOLEKIT_MSG="no" | ||
214 | +LIBCK_CONNECTOR="" | ||
215 | +AC_ARG_WITH(consolekit, | ||
216 | + [ --with-consolekit Enable ConsoleKit support], | ||
217 | + [ if test "x$withval" != "xno" ; then | ||
218 | + AC_PATH_TOOL([PKGCONFIG], [pkg-config], [no]) | ||
219 | + if test "$PKGCONFIG" != "no"; then | ||
220 | + AC_MSG_CHECKING([for ck-connector]) | ||
221 | + if $PKGCONFIG --exists ck-connector; then | ||
222 | + CKCON_CFLAGS=`$PKGCONFIG --cflags ck-connector` | ||
223 | + CKCON_LIBS=`$PKGCONFIG --libs ck-connector` | ||
224 | + CPPFLAGS="$CPPFLAGS $CKCON_CFLAGS" | ||
225 | + SSHDLIBS="$SSHDLIBS $CKCON_LIBS" | ||
226 | + AC_MSG_RESULT([yes]) | ||
227 | + AC_DEFINE(USE_CONSOLEKIT, 1, [Define if you want ConsoleKit support.]) | ||
228 | + CONSOLEKIT_MSG="yes" | ||
229 | + else | ||
230 | + AC_MSG_RESULT([no]) | ||
231 | + fi | ||
232 | + fi | ||
233 | + fi ] | ||
234 | +) | ||
235 | + | ||
236 | # Looking for programs, paths and files | ||
237 | |||
238 | PRIVSEP_PATH=/var/empty | ||
239 | @@ -4871,6 +4895,7 @@ echo " MD5 password support: $MD5_MSG" | ||
240 | echo " libedit support: $LIBEDIT_MSG" | ||
241 | echo " Solaris process contract support: $SPC_MSG" | ||
242 | echo " Solaris project support: $SP_MSG" | ||
243 | +echo " ConsoleKit support: $CONSOLEKIT_MSG" | ||
244 | echo " IP address in \$DISPLAY hack: $DISPLAY_HACK_MSG" | ||
245 | echo " Translate v4 in v6 hack: $IPV4_IN6_HACK_MSG" | ||
246 | echo " BSD Auth support: $BSD_AUTH_MSG" | ||
247 | diff --git a/consolekit.c b/consolekit.c | ||
248 | new file mode 100644 | ||
249 | index 0000000..f1039e6 | ||
250 | --- /dev/null | ||
251 | +++ b/consolekit.c | ||
252 | @@ -0,0 +1,240 @@ | ||
253 | +/* | ||
254 | + * Copyright (c) 2008 Colin Watson. All rights reserved. | ||
255 | + * | ||
256 | + * Permission to use, copy, modify, and distribute this software for any | ||
257 | + * purpose with or without fee is hereby granted, provided that the above | ||
258 | + * copyright notice and this permission notice appear in all copies. | ||
259 | + * | ||
260 | + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
261 | + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
262 | + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
263 | + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
264 | + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
265 | + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
266 | + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
267 | + */ | ||
268 | +/* | ||
269 | + * Loosely based on pam-ck-connector, which is: | ||
270 | + * | ||
271 | + * Copyright (c) 2007 David Zeuthen <davidz@redhat.com> | ||
272 | + * | ||
273 | + * Permission is hereby granted, free of charge, to any person | ||
274 | + * obtaining a copy of this software and associated documentation | ||
275 | + * files (the "Software"), to deal in the Software without | ||
276 | + * restriction, including without limitation the rights to use, | ||
277 | + * copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
278 | + * copies of the Software, and to permit persons to whom the | ||
279 | + * Software is furnished to do so, subject to the following | ||
280 | + * conditions: | ||
281 | + * | ||
282 | + * The above copyright notice and this permission notice shall be | ||
283 | + * included in all copies or substantial portions of the Software. | ||
284 | + * | ||
285 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
286 | + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
287 | + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
288 | + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
289 | + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
290 | + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
291 | + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
292 | + * OTHER DEALINGS IN THE SOFTWARE. | ||
293 | + */ | ||
294 | + | ||
295 | +#include "includes.h" | ||
296 | + | ||
297 | +#ifdef USE_CONSOLEKIT | ||
298 | + | ||
299 | +#include <ck-connector.h> | ||
300 | + | ||
301 | +#include "openbsd-compat/sys-queue.h" | ||
302 | +#include "xmalloc.h" | ||
303 | +#include "channels.h" | ||
304 | +#include "key.h" | ||
305 | +#include "hostfile.h" | ||
306 | +#include "auth.h" | ||
307 | +#include "log.h" | ||
308 | +#include "servconf.h" | ||
309 | +#include "canohost.h" | ||
310 | +#include "session.h" | ||
311 | +#include "consolekit.h" | ||
312 | + | ||
313 | +extern ServerOptions options; | ||
314 | +extern u_int utmp_len; | ||
315 | + | ||
316 | +void | ||
317 | +set_active(const char *cookie) | ||
318 | +{ | ||
319 | + DBusError err; | ||
320 | + DBusConnection *connection; | ||
321 | + DBusMessage *message = NULL, *reply = NULL; | ||
322 | + char *sid; | ||
323 | + DBusMessageIter iter, subiter; | ||
324 | + const char *interface, *property; | ||
325 | + dbus_bool_t active; | ||
326 | + | ||
327 | + dbus_error_init(&err); | ||
328 | + connection = dbus_bus_get_private(DBUS_BUS_SYSTEM, &err); | ||
329 | + if (!connection) { | ||
330 | + if (dbus_error_is_set(&err)) { | ||
331 | + error("unable to open DBus connection: %s", | ||
332 | + err.message); | ||
333 | + dbus_error_free(&err); | ||
334 | + } | ||
335 | + goto out; | ||
336 | + } | ||
337 | + dbus_connection_set_exit_on_disconnect(connection, FALSE); | ||
338 | + | ||
339 | + message = dbus_message_new_method_call("org.freedesktop.ConsoleKit", | ||
340 | + "/org/freedesktop/ConsoleKit/Manager", | ||
341 | + "org.freedesktop.ConsoleKit.Manager", | ||
342 | + "GetSessionForCookie"); | ||
343 | + if (!message) | ||
344 | + goto out; | ||
345 | + if (!dbus_message_append_args(message, DBUS_TYPE_STRING, &cookie, | ||
346 | + DBUS_TYPE_INVALID)) { | ||
347 | + if (dbus_error_is_set(&err)) { | ||
348 | + error("unable to get current session: %s", | ||
349 | + err.message); | ||
350 | + dbus_error_free(&err); | ||
351 | + } | ||
352 | + goto out; | ||
353 | + } | ||
354 | + | ||
355 | + dbus_error_init(&err); | ||
356 | + reply = dbus_connection_send_with_reply_and_block(connection, message, | ||
357 | + -1, &err); | ||
358 | + if (!reply) { | ||
359 | + if (dbus_error_is_set(&err)) { | ||
360 | + error("unable to get current session: %s", | ||
361 | + err.message); | ||
362 | + dbus_error_free(&err); | ||
363 | + } | ||
364 | + goto out; | ||
365 | + } | ||
366 | + | ||
367 | + dbus_error_init(&err); | ||
368 | + if (!dbus_message_get_args(reply, &err, | ||
369 | + DBUS_TYPE_OBJECT_PATH, &sid, | ||
370 | + DBUS_TYPE_INVALID)) { | ||
371 | + if (dbus_error_is_set(&err)) { | ||
372 | + error("unable to get current session: %s", | ||
373 | + err.message); | ||
374 | + dbus_error_free(&err); | ||
375 | + } | ||
376 | + goto out; | ||
377 | + } | ||
378 | + dbus_message_unref(reply); | ||
379 | + dbus_message_unref(message); | ||
380 | + message = reply = NULL; | ||
381 | + | ||
382 | + message = dbus_message_new_method_call("org.freedesktop.ConsoleKit", | ||
383 | + sid, "org.freedesktop.DBus.Properties", "Set"); | ||
384 | + if (!message) | ||
385 | + goto out; | ||
386 | + interface = "org.freedesktop.ConsoleKit.Session"; | ||
387 | + property = "active"; | ||
388 | + if (!dbus_message_append_args(message, | ||
389 | + DBUS_TYPE_STRING, &interface, DBUS_TYPE_STRING, &property, | ||
390 | + DBUS_TYPE_INVALID)) | ||
391 | + goto out; | ||
392 | + dbus_message_iter_init_append(message, &iter); | ||
393 | + if (!dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, | ||
394 | + DBUS_TYPE_BOOLEAN_AS_STRING, &subiter)) | ||
395 | + goto out; | ||
396 | + active = TRUE; | ||
397 | + if (!dbus_message_iter_append_basic(&subiter, DBUS_TYPE_BOOLEAN, | ||
398 | + &active)) | ||
399 | + goto out; | ||
400 | + if (!dbus_message_iter_close_container(&iter, &subiter)) | ||
401 | + goto out; | ||
402 | + | ||
403 | + dbus_error_init(&err); | ||
404 | + reply = dbus_connection_send_with_reply_and_block(connection, message, | ||
405 | + -1, &err); | ||
406 | + if (!reply) { | ||
407 | + if (dbus_error_is_set(&err)) { | ||
408 | + error("unable to make current session active: %s", | ||
409 | + err.message); | ||
410 | + dbus_error_free(&err); | ||
411 | + } | ||
412 | + goto out; | ||
413 | + } | ||
414 | + | ||
415 | +out: | ||
416 | + if (reply) | ||
417 | + dbus_message_unref(reply); | ||
418 | + if (message) | ||
419 | + dbus_message_unref(message); | ||
420 | +} | ||
421 | + | ||
422 | +/* | ||
423 | + * We pass display separately rather than using s->display because the | ||
424 | + * latter is not available in the monitor when using privsep. | ||
425 | + */ | ||
426 | + | ||
427 | +char * | ||
428 | +consolekit_register(Session *s, const char *display) | ||
429 | +{ | ||
430 | + DBusError err; | ||
431 | + const char *tty = s->tty; | ||
432 | + const char *remote_host_name; | ||
433 | + dbus_bool_t is_local = FALSE; | ||
434 | + const char *cookie = NULL; | ||
435 | + | ||
436 | + if (s->ckc) { | ||
437 | + debug("already registered with ConsoleKit"); | ||
438 | + return xstrdup(ck_connector_get_cookie(s->ckc)); | ||
439 | + } | ||
440 | + | ||
441 | + s->ckc = ck_connector_new(); | ||
442 | + if (!s->ckc) { | ||
443 | + error("ck_connector_new failed"); | ||
444 | + return NULL; | ||
445 | + } | ||
446 | + | ||
447 | + if (!tty) | ||
448 | + tty = ""; | ||
449 | + if (!display) | ||
450 | + display = ""; | ||
451 | + remote_host_name = get_remote_name_or_ip(utmp_len, options.use_dns); | ||
452 | + if (!remote_host_name) | ||
453 | + remote_host_name = ""; | ||
454 | + | ||
455 | + dbus_error_init(&err); | ||
456 | + if (!ck_connector_open_session_with_parameters(s->ckc, &err, | ||
457 | + "unix-user", &s->pw->pw_uid, | ||
458 | + "display-device", &tty, | ||
459 | + "x11-display", &display, | ||
460 | + "remote-host-name", &remote_host_name, | ||
461 | + "is-local", &is_local, | ||
462 | + NULL)) { | ||
463 | + if (dbus_error_is_set(&err)) { | ||
464 | + debug("%s", err.message); | ||
465 | + dbus_error_free(&err); | ||
466 | + } else { | ||
467 | + debug("insufficient privileges or D-Bus / ConsoleKit " | ||
468 | + "not available"); | ||
469 | + } | ||
470 | + return NULL; | ||
471 | + } | ||
472 | + | ||
473 | + debug("registered uid=%d on tty='%s' with ConsoleKit", | ||
474 | + s->pw->pw_uid, s->tty); | ||
475 | + | ||
476 | + cookie = ck_connector_get_cookie(s->ckc); | ||
477 | + set_active(cookie); | ||
478 | + return xstrdup(cookie); | ||
479 | +} | ||
480 | + | ||
481 | +void | ||
482 | +consolekit_unregister(Session *s) | ||
483 | +{ | ||
484 | + if (s->ckc) { | ||
485 | + debug("unregistering ConsoleKit session %s", | ||
486 | + ck_connector_get_cookie(s->ckc)); | ||
487 | + ck_connector_unref(s->ckc); | ||
488 | + s->ckc = NULL; | ||
489 | + } | ||
490 | +} | ||
491 | + | ||
492 | +#endif /* USE_CONSOLEKIT */ | ||
493 | diff --git a/consolekit.h b/consolekit.h | ||
494 | new file mode 100644 | ||
495 | index 0000000..8ce3716 | ||
496 | --- /dev/null | ||
497 | +++ b/consolekit.h | ||
498 | @@ -0,0 +1,24 @@ | ||
499 | +/* | ||
500 | + * Copyright (c) 2008 Colin Watson. All rights reserved. | ||
501 | + * | ||
502 | + * Permission to use, copy, modify, and distribute this software for any | ||
503 | + * purpose with or without fee is hereby granted, provided that the above | ||
504 | + * copyright notice and this permission notice appear in all copies. | ||
505 | + * | ||
506 | + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
507 | + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
508 | + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
509 | + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
510 | + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
511 | + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
512 | + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
513 | + */ | ||
514 | + | ||
515 | +#ifdef USE_CONSOLEKIT | ||
516 | + | ||
517 | +struct Session; | ||
518 | + | ||
519 | +char * consolekit_register(struct Session *, const char *); | ||
520 | +void consolekit_unregister(struct Session *); | ||
521 | + | ||
522 | +#endif /* USE_CONSOLEKIT */ | ||
523 | diff --git a/monitor.c b/monitor.c | ||
524 | index 88f472e..8ffea4f 100644 | ||
525 | --- a/monitor.c | ||
526 | +++ b/monitor.c | ||
527 | @@ -98,6 +98,9 @@ | ||
528 | #include "jpake.h" | ||
529 | #include "roaming.h" | ||
530 | #include "authfd.h" | ||
531 | +#ifdef USE_CONSOLEKIT | ||
532 | +#include "consolekit.h" | ||
533 | +#endif | ||
534 | |||
535 | #ifdef GSSAPI | ||
536 | static Gssctxt *gsscontext = NULL; | ||
537 | @@ -193,6 +196,10 @@ int mm_answer_audit_command(int, Buffer *); | ||
538 | |||
539 | static int monitor_read_log(struct monitor *); | ||
540 | |||
541 | +#ifdef USE_CONSOLEKIT | ||
542 | +int mm_answer_consolekit_register(int, Buffer *); | ||
543 | +#endif | ||
544 | + | ||
545 | static Authctxt *authctxt; | ||
546 | static BIGNUM *ssh1_challenge = NULL; /* used for ssh1 rsa auth */ | ||
547 | |||
548 | @@ -285,6 +292,9 @@ struct mon_table mon_dispatch_postauth20[] = { | ||
549 | {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, | ||
550 | {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT, mm_answer_audit_command}, | ||
551 | #endif | ||
552 | +#ifdef USE_CONSOLEKIT | ||
553 | + {MONITOR_REQ_CONSOLEKIT_REGISTER, 0, mm_answer_consolekit_register}, | ||
554 | +#endif | ||
555 | {0, 0, NULL} | ||
556 | }; | ||
557 | |||
558 | @@ -327,6 +337,9 @@ struct mon_table mon_dispatch_postauth15[] = { | ||
559 | {MONITOR_REQ_AUDIT_EVENT, MON_PERMIT, mm_answer_audit_event}, | ||
560 | {MONITOR_REQ_AUDIT_COMMAND, MON_PERMIT|MON_ONCE, mm_answer_audit_command}, | ||
561 | #endif | ||
562 | +#ifdef USE_CONSOLEKIT | ||
563 | + {MONITOR_REQ_CONSOLEKIT_REGISTER, 0, mm_answer_consolekit_register}, | ||
564 | +#endif | ||
565 | {0, 0, NULL} | ||
566 | }; | ||
567 | |||
568 | @@ -514,6 +527,9 @@ monitor_child_postauth(struct monitor *pmonitor) | ||
569 | monitor_permit(mon_dispatch, MONITOR_REQ_PTY, 1); | ||
570 | monitor_permit(mon_dispatch, MONITOR_REQ_PTYCLEANUP, 1); | ||
571 | } | ||
572 | +#ifdef USE_CONSOLEKIT | ||
573 | + monitor_permit(mon_dispatch, MONITOR_REQ_CONSOLEKIT_REGISTER, 1); | ||
574 | +#endif | ||
575 | |||
576 | for (;;) | ||
577 | monitor_read(pmonitor, mon_dispatch, NULL); | ||
578 | @@ -2493,3 +2509,30 @@ mm_answer_jpake_check_confirm(int sock, Buffer *m) | ||
579 | } | ||
580 | |||
581 | #endif /* JPAKE */ | ||
582 | + | ||
583 | +#ifdef USE_CONSOLEKIT | ||
584 | +int | ||
585 | +mm_answer_consolekit_register(int sock, Buffer *m) | ||
586 | +{ | ||
587 | + Session *s; | ||
588 | + char *tty, *display; | ||
589 | + char *cookie = NULL; | ||
590 | + | ||
591 | + debug3("%s entering", __func__); | ||
592 | + | ||
593 | + tty = buffer_get_string(m, NULL); | ||
594 | + display = buffer_get_string(m, NULL); | ||
595 | + s = session_by_tty(tty); | ||
596 | + if (s != NULL) | ||
597 | + cookie = consolekit_register(s, display); | ||
598 | + buffer_clear(m); | ||
599 | + buffer_put_cstring(m, cookie != NULL ? cookie : ""); | ||
600 | + mm_request_send(sock, MONITOR_ANS_CONSOLEKIT_REGISTER, m); | ||
601 | + | ||
602 | + free(cookie); | ||
603 | + free(display); | ||
604 | + free(tty); | ||
605 | + | ||
606 | + return (0); | ||
607 | +} | ||
608 | +#endif /* USE_CONSOLEKIT */ | ||
609 | diff --git a/monitor.h b/monitor.h | ||
610 | index 3c13706..cd83428 100644 | ||
611 | --- a/monitor.h | ||
612 | +++ b/monitor.h | ||
613 | @@ -75,6 +75,8 @@ enum monitor_reqtype { | ||
614 | |||
615 | MONITOR_REQ_AUTHROLE = 154, | ||
616 | |||
617 | + MONITOR_REQ_CONSOLEKIT_REGISTER = 156, MONITOR_ANS_CONSOLEKIT_REGISTER = 157, | ||
618 | + | ||
619 | }; | ||
620 | |||
621 | struct mm_master; | ||
622 | diff --git a/monitor_wrap.c b/monitor_wrap.c | ||
623 | index 69bc324..670b62d 100644 | ||
624 | --- a/monitor_wrap.c | ||
625 | +++ b/monitor_wrap.c | ||
626 | @@ -1516,3 +1516,34 @@ mm_jpake_check_confirm(const BIGNUM *k, | ||
627 | return success; | ||
628 | } | ||
629 | #endif /* JPAKE */ | ||
630 | + | ||
631 | +#ifdef USE_CONSOLEKIT | ||
632 | +char * | ||
633 | +mm_consolekit_register(Session *s, const char *display) | ||
634 | +{ | ||
635 | + Buffer m; | ||
636 | + char *cookie; | ||
637 | + | ||
638 | + debug3("%s entering", __func__); | ||
639 | + | ||
640 | + if (s->ttyfd == -1) | ||
641 | + return NULL; | ||
642 | + buffer_init(&m); | ||
643 | + buffer_put_cstring(&m, s->tty); | ||
644 | + buffer_put_cstring(&m, display != NULL ? display : ""); | ||
645 | + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_CONSOLEKIT_REGISTER, &m); | ||
646 | + buffer_clear(&m); | ||
647 | + | ||
648 | + mm_request_receive_expect(pmonitor->m_recvfd, | ||
649 | + MONITOR_ANS_CONSOLEKIT_REGISTER, &m); | ||
650 | + cookie = buffer_get_string(&m, NULL); | ||
651 | + buffer_free(&m); | ||
652 | + | ||
653 | + /* treat empty cookie as missing cookie */ | ||
654 | + if (strlen(cookie) == 0) { | ||
655 | + free(cookie); | ||
656 | + cookie = NULL; | ||
657 | + } | ||
658 | + return (cookie); | ||
659 | +} | ||
660 | +#endif /* USE_CONSOLEKIT */ | ||
661 | diff --git a/monitor_wrap.h b/monitor_wrap.h | ||
662 | index 4d12e29..360fb9f 100644 | ||
663 | --- a/monitor_wrap.h | ||
664 | +++ b/monitor_wrap.h | ||
665 | @@ -131,4 +131,8 @@ void *mm_zalloc(struct mm_master *, u_int, u_int); | ||
666 | void mm_zfree(struct mm_master *, void *); | ||
667 | void mm_init_compression(struct mm_master *); | ||
668 | |||
669 | +#ifdef USE_CONSOLEKIT | ||
670 | +char *mm_consolekit_register(struct Session *, const char *); | ||
671 | +#endif /* USE_CONSOLEKIT */ | ||
672 | + | ||
673 | #endif /* _MM_WRAP_H_ */ | ||
674 | diff --git a/session.c b/session.c | ||
675 | index 5ddd82a..14df226 100644 | ||
676 | --- a/session.c | ||
677 | +++ b/session.c | ||
678 | @@ -92,6 +92,7 @@ | ||
679 | #include "kex.h" | ||
680 | #include "monitor_wrap.h" | ||
681 | #include "sftp.h" | ||
682 | +#include "consolekit.h" | ||
683 | |||
684 | #if defined(KRB5) && defined(USE_AFS) | ||
685 | #include <kafs.h> | ||
686 | @@ -1155,6 +1156,9 @@ do_setup_env(Session *s, const char *shell) | ||
687 | #if !defined (HAVE_LOGIN_CAP) && !defined (HAVE_CYGWIN) | ||
688 | char *path = NULL; | ||
689 | #endif | ||
690 | +#ifdef USE_CONSOLEKIT | ||
691 | + const char *ckcookie = NULL; | ||
692 | +#endif /* USE_CONSOLEKIT */ | ||
693 | |||
694 | /* Initialize the environment. */ | ||
695 | envsize = 100; | ||
696 | @@ -1299,6 +1303,11 @@ do_setup_env(Session *s, const char *shell) | ||
697 | child_set_env(&env, &envsize, "KRB5CCNAME", | ||
698 | s->authctxt->krb5_ccname); | ||
699 | #endif | ||
700 | +#ifdef USE_CONSOLEKIT | ||
701 | + ckcookie = PRIVSEP(consolekit_register(s, s->display)); | ||
702 | + if (ckcookie) | ||
703 | + child_set_env(&env, &envsize, "XDG_SESSION_COOKIE", ckcookie); | ||
704 | +#endif /* USE_CONSOLEKIT */ | ||
705 | #ifdef USE_PAM | ||
706 | /* | ||
707 | * Pull in any environment variables that may have | ||
708 | @@ -2348,6 +2357,10 @@ session_pty_cleanup2(Session *s) | ||
709 | |||
710 | debug("session_pty_cleanup: session %d release %s", s->self, s->tty); | ||
711 | |||
712 | +#ifdef USE_CONSOLEKIT | ||
713 | + consolekit_unregister(s); | ||
714 | +#endif /* USE_CONSOLEKIT */ | ||
715 | + | ||
716 | /* Record that the user has logged out. */ | ||
717 | if (s->pid != 0) | ||
718 | record_logout(s->pid, s->tty, s->pw->pw_name); | ||
719 | diff --git a/session.h b/session.h | ||
720 | index ef6593c..a6b6983 100644 | ||
721 | --- a/session.h | ||
722 | +++ b/session.h | ||
723 | @@ -26,6 +26,8 @@ | ||
724 | #ifndef SESSION_H | ||
725 | #define SESSION_H | ||
726 | |||
727 | +struct _CkConnector; | ||
728 | + | ||
729 | #define TTYSZ 64 | ||
730 | typedef struct Session Session; | ||
731 | struct Session { | ||
732 | @@ -61,6 +63,10 @@ struct Session { | ||
733 | char *name; | ||
734 | char *val; | ||
735 | } *env; | ||
736 | + | ||
737 | +#ifdef USE_CONSOLEKIT | ||
738 | + struct _CkConnector *ckc; | ||
739 | +#endif /* USE_CONSOLEKIT */ | ||
740 | }; | ||
741 | |||
742 | void do_authenticated(Authctxt *); | ||
diff --git a/debian/patches/debian-banner.patch b/debian/patches/debian-banner.patch new file mode 100644 index 000000000..4cae13961 --- /dev/null +++ b/debian/patches/debian-banner.patch | |||
@@ -0,0 +1,111 @@ | |||
1 | From 68ebfc0e90ceb0f7b24dfb38979df6a80b7ec9e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Kees Cook <kees@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:06 +0000 | ||
4 | Subject: Add DebianBanner server configuration option | ||
5 | |||
6 | Setting this to "no" causes sshd to omit the Debian revision from its | ||
7 | initial protocol handshake, for those scared by package-versioning.patch. | ||
8 | |||
9 | Bug-Debian: http://bugs.debian.org/562048 | ||
10 | Forwarded: not-needed | ||
11 | Last-Update: 2013-09-14 | ||
12 | |||
13 | Patch-Name: debian-banner.patch | ||
14 | --- | ||
15 | servconf.c | 9 +++++++++ | ||
16 | servconf.h | 2 ++ | ||
17 | sshd.c | 3 ++- | ||
18 | sshd_config.5 | 5 +++++ | ||
19 | 4 files changed, 18 insertions(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/servconf.c b/servconf.c | ||
22 | index 65f71ad..63ff4ff 100644 | ||
23 | --- a/servconf.c | ||
24 | +++ b/servconf.c | ||
25 | @@ -157,6 +157,7 @@ initialize_server_options(ServerOptions *options) | ||
26 | options->ip_qos_interactive = -1; | ||
27 | options->ip_qos_bulk = -1; | ||
28 | options->version_addendum = NULL; | ||
29 | + options->debian_banner = -1; | ||
30 | } | ||
31 | |||
32 | void | ||
33 | @@ -312,6 +313,8 @@ fill_default_server_options(ServerOptions *options) | ||
34 | options->ip_qos_bulk = IPTOS_THROUGHPUT; | ||
35 | if (options->version_addendum == NULL) | ||
36 | options->version_addendum = xstrdup(""); | ||
37 | + if (options->debian_banner == -1) | ||
38 | + options->debian_banner = 1; | ||
39 | /* Turn privilege separation on by default */ | ||
40 | if (use_privsep == -1) | ||
41 | use_privsep = PRIVSEP_NOSANDBOX; | ||
42 | @@ -362,6 +365,7 @@ typedef enum { | ||
43 | sKexAlgorithms, sIPQoS, sVersionAddendum, | ||
44 | sAuthorizedKeysCommand, sAuthorizedKeysCommandUser, | ||
45 | sAuthenticationMethods, sHostKeyAgent, | ||
46 | + sDebianBanner, | ||
47 | sDeprecated, sUnsupported | ||
48 | } ServerOpCodes; | ||
49 | |||
50 | @@ -504,6 +508,7 @@ static struct { | ||
51 | { "authorizedkeyscommanduser", sAuthorizedKeysCommandUser, SSHCFG_ALL }, | ||
52 | { "versionaddendum", sVersionAddendum, SSHCFG_GLOBAL }, | ||
53 | { "authenticationmethods", sAuthenticationMethods, SSHCFG_ALL }, | ||
54 | + { "debianbanner", sDebianBanner, SSHCFG_GLOBAL }, | ||
55 | { NULL, sBadOption, 0 } | ||
56 | }; | ||
57 | |||
58 | @@ -1666,6 +1671,10 @@ process_server_config_line(ServerOptions *options, char *line, | ||
59 | } | ||
60 | return 0; | ||
61 | |||
62 | + case sDebianBanner: | ||
63 | + intptr = &options->debian_banner; | ||
64 | + goto parse_int; | ||
65 | + | ||
66 | case sDeprecated: | ||
67 | logit("%s line %d: Deprecated option %s", | ||
68 | filename, linenum, arg); | ||
69 | diff --git a/servconf.h b/servconf.h | ||
70 | index eba76ee..98d68ce 100644 | ||
71 | --- a/servconf.h | ||
72 | +++ b/servconf.h | ||
73 | @@ -188,6 +188,8 @@ typedef struct { | ||
74 | |||
75 | u_int num_auth_methods; | ||
76 | char *auth_methods[MAX_AUTH_METHODS]; | ||
77 | + | ||
78 | + int debian_banner; | ||
79 | } ServerOptions; | ||
80 | |||
81 | /* Information about the incoming connection as used by Match */ | ||
82 | diff --git a/sshd.c b/sshd.c | ||
83 | index 82168a1..c49a877 100644 | ||
84 | --- a/sshd.c | ||
85 | +++ b/sshd.c | ||
86 | @@ -440,7 +440,8 @@ sshd_exchange_identification(int sock_in, int sock_out) | ||
87 | } | ||
88 | |||
89 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", | ||
90 | - major, minor, SSH_RELEASE, | ||
91 | + major, minor, | ||
92 | + options.debian_banner ? SSH_RELEASE : SSH_RELEASE_MINIMUM, | ||
93 | *options.version_addendum == '\0' ? "" : " ", | ||
94 | options.version_addendum, newline); | ||
95 | |||
96 | diff --git a/sshd_config.5 b/sshd_config.5 | ||
97 | index 39643de..bdca797 100644 | ||
98 | --- a/sshd_config.5 | ||
99 | +++ b/sshd_config.5 | ||
100 | @@ -413,6 +413,11 @@ or | ||
101 | .Dq no . | ||
102 | The default is | ||
103 | .Dq delayed . | ||
104 | +.It Cm DebianBanner | ||
105 | +Specifies whether the distribution-specified extra version suffix is | ||
106 | +included during initial protocol handshake. | ||
107 | +The default is | ||
108 | +.Dq yes . | ||
109 | .It Cm DenyGroups | ||
110 | This keyword can be followed by a list of group name patterns, separated | ||
111 | by spaces. | ||
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch new file mode 100644 index 000000000..70e057ed5 --- /dev/null +++ b/debian/patches/debian-config.patch | |||
@@ -0,0 +1,157 @@ | |||
1 | From f08f2d9c3fedf37f97f1b2d06f1fe36af4e5f1c3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 | ||
4 | Subject: Various Debian-specific configuration changes | ||
5 | |||
6 | ssh: Enable ForwardX11Trusted, returning to earlier semantics which cause | ||
7 | fewer problems with existing setups (http://bugs.debian.org/237021). | ||
8 | |||
9 | ssh: Set 'SendEnv LANG LC_*' by default (http://bugs.debian.org/264024). | ||
10 | |||
11 | ssh: Enable HashKnownHosts by default to try to limit the spread of ssh | ||
12 | worms. | ||
13 | |||
14 | ssh: Enable GSSAPIAuthentication and disable GSSAPIDelegateCredentials by | ||
15 | default. | ||
16 | |||
17 | sshd: Refer to /usr/share/doc/openssh-server/README.Debian.gz alongside | ||
18 | PermitRootLogin default. | ||
19 | |||
20 | Document all of this, along with several sshd defaults set in | ||
21 | debian/openssh-server.postinst. | ||
22 | |||
23 | Author: Russ Allbery <rra@debian.org> | ||
24 | Forwarded: not-needed | ||
25 | Last-Update: 2014-02-12 | ||
26 | |||
27 | Patch-Name: debian-config.patch | ||
28 | --- | ||
29 | readconf.c | 2 +- | ||
30 | ssh_config | 7 ++++++- | ||
31 | ssh_config.5 | 19 ++++++++++++++++++- | ||
32 | sshd_config | 1 + | ||
33 | sshd_config.5 | 25 +++++++++++++++++++++++++ | ||
34 | 5 files changed, 51 insertions(+), 3 deletions(-) | ||
35 | |||
36 | diff --git a/readconf.c b/readconf.c | ||
37 | index 273552d..6ac8bea 100644 | ||
38 | --- a/readconf.c | ||
39 | +++ b/readconf.c | ||
40 | @@ -1618,7 +1618,7 @@ fill_default_options(Options * options) | ||
41 | if (options->forward_x11 == -1) | ||
42 | options->forward_x11 = 0; | ||
43 | if (options->forward_x11_trusted == -1) | ||
44 | - options->forward_x11_trusted = 0; | ||
45 | + options->forward_x11_trusted = 1; | ||
46 | if (options->forward_x11_timeout == -1) | ||
47 | options->forward_x11_timeout = 1200; | ||
48 | if (options->exit_on_forward_failure == -1) | ||
49 | diff --git a/ssh_config b/ssh_config | ||
50 | index 228e5ab..c9386aa 100644 | ||
51 | --- a/ssh_config | ||
52 | +++ b/ssh_config | ||
53 | @@ -17,9 +17,10 @@ | ||
54 | # list of available options, their meanings and defaults, please see the | ||
55 | # ssh_config(5) man page. | ||
56 | |||
57 | -# Host * | ||
58 | +Host * | ||
59 | # ForwardAgent no | ||
60 | # ForwardX11 no | ||
61 | +# ForwardX11Trusted yes | ||
62 | # RhostsRSAAuthentication no | ||
63 | # RSAAuthentication yes | ||
64 | # PasswordAuthentication yes | ||
65 | @@ -48,3 +49,7 @@ | ||
66 | # VisualHostKey no | ||
67 | # ProxyCommand ssh -q -W %h:%p gateway.example.com | ||
68 | # RekeyLimit 1G 1h | ||
69 | + SendEnv LANG LC_* | ||
70 | + HashKnownHosts yes | ||
71 | + GSSAPIAuthentication yes | ||
72 | + GSSAPIDelegateCredentials no | ||
73 | diff --git a/ssh_config.5 b/ssh_config.5 | ||
74 | index 85f306c..cc91a5c 100644 | ||
75 | --- a/ssh_config.5 | ||
76 | +++ b/ssh_config.5 | ||
77 | @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more | ||
78 | host-specific declarations should be given near the beginning of the | ||
79 | file, and general defaults at the end. | ||
80 | .Pp | ||
81 | +Note that the Debian | ||
82 | +.Ic openssh-client | ||
83 | +package sets several options as standard in | ||
84 | +.Pa /etc/ssh/ssh_config | ||
85 | +which are not the default in | ||
86 | +.Xr ssh 1 : | ||
87 | +.Pp | ||
88 | +.Bl -bullet -offset indent -compact | ||
89 | +.It | ||
90 | +.Cm SendEnv No LANG LC_* | ||
91 | +.It | ||
92 | +.Cm HashKnownHosts No yes | ||
93 | +.It | ||
94 | +.Cm GSSAPIAuthentication No yes | ||
95 | +.El | ||
96 | +.Pp | ||
97 | The configuration file has the following format: | ||
98 | .Pp | ||
99 | Empty lines and lines starting with | ||
100 | @@ -648,7 +664,8 @@ token used for the session will be set to expire after 20 minutes. | ||
101 | Remote clients will be refused access after this time. | ||
102 | .Pp | ||
103 | The default is | ||
104 | -.Dq no . | ||
105 | +.Dq yes | ||
106 | +(Debian-specific). | ||
107 | .Pp | ||
108 | See the X11 SECURITY extension specification for full details on | ||
109 | the restrictions imposed on untrusted clients. | ||
110 | diff --git a/sshd_config b/sshd_config | ||
111 | index d9b8594..4db32f5 100644 | ||
112 | --- a/sshd_config | ||
113 | +++ b/sshd_config | ||
114 | @@ -41,6 +41,7 @@ | ||
115 | # Authentication: | ||
116 | |||
117 | #LoginGraceTime 2m | ||
118 | +# See /usr/share/doc/openssh-server/README.Debian.gz. | ||
119 | #PermitRootLogin yes | ||
120 | #StrictModes yes | ||
121 | #MaxAuthTries 6 | ||
122 | diff --git a/sshd_config.5 b/sshd_config.5 | ||
123 | index 9fa6086..496530b 100644 | ||
124 | --- a/sshd_config.5 | ||
125 | +++ b/sshd_config.5 | ||
126 | @@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes | ||
127 | .Pq \&" | ||
128 | in order to represent arguments containing spaces. | ||
129 | .Pp | ||
130 | +Note that the Debian | ||
131 | +.Ic openssh-server | ||
132 | +package sets several options as standard in | ||
133 | +.Pa /etc/ssh/sshd_config | ||
134 | +which are not the default in | ||
135 | +.Xr sshd 8 . | ||
136 | +The exact list depends on whether the package was installed fresh or | ||
137 | +upgraded from various possible previous versions, but includes at least the | ||
138 | +following: | ||
139 | +.Pp | ||
140 | +.Bl -bullet -offset indent -compact | ||
141 | +.It | ||
142 | +.Cm ChallengeResponseAuthentication No no | ||
143 | +.It | ||
144 | +.Cm X11Forwarding No yes | ||
145 | +.It | ||
146 | +.Cm PrintMotd No no | ||
147 | +.It | ||
148 | +.Cm AcceptEnv No LANG LC_* | ||
149 | +.It | ||
150 | +.Cm Subsystem No sftp /usr/lib/openssh/sftp-server | ||
151 | +.It | ||
152 | +.Cm UsePAM No yes | ||
153 | +.El | ||
154 | +.Pp | ||
155 | The possible | ||
156 | keywords and their meanings are as follows (note that | ||
157 | keywords are case-insensitive and arguments are case-sensitive): | ||
diff --git a/debian/patches/dnssec-sshfp.patch b/debian/patches/dnssec-sshfp.patch new file mode 100644 index 000000000..ccedef08f --- /dev/null +++ b/debian/patches/dnssec-sshfp.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | From a3e8cef2bae563fe8c87cf9f32511a0808dd47eb Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:01 +0000 | ||
4 | Subject: Force use of DNSSEC even if "options edns0" isn't in resolv.conf | ||
5 | |||
6 | This allows SSHFP DNS records to be verified if glibc 2.11 is installed. | ||
7 | |||
8 | Origin: vendor, https://cvs.fedoraproject.org/viewvc/F-12/openssh/openssh-5.2p1-edns.patch?revision=1.1&view=markup | ||
9 | Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049 | ||
10 | Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572049 | ||
11 | Last-Update: 2010-04-06 | ||
12 | |||
13 | Patch-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 | |||
20 | diff --git a/dns.c b/dns.c | ||
21 | index 630b97a..478c3d9 100644 | ||
22 | --- a/dns.c | ||
23 | +++ b/dns.c | ||
24 | @@ -196,6 +196,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address, | ||
25 | { | ||
26 | u_int counter; | ||
27 | int result; | ||
28 | + unsigned int rrset_flags = 0; | ||
29 | struct rrsetinfo *fingerprints = NULL; | ||
30 | |||
31 | u_int8_t hostkey_algorithm; | ||
32 | @@ -219,8 +220,19 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address, | ||
33 | return -1; | ||
34 | } | ||
35 | |||
36 | + /* | ||
37 | + * Original getrrsetbyname function, found on OpenBSD for example, | ||
38 | + * doesn't accept any flag and prerequisite for obtaining AD bit in | ||
39 | + * DNS response is set by "options edns0" in resolv.conf. | ||
40 | + * | ||
41 | + * Our version is more clever and use RRSET_FORCE_EDNS0 flag. | ||
42 | + */ | ||
43 | +#ifndef HAVE_GETRRSETBYNAME | ||
44 | + rrset_flags |= RRSET_FORCE_EDNS0; | ||
45 | +#endif | ||
46 | result = getrrsetbyname(hostname, DNS_RDATACLASS_IN, | ||
47 | - DNS_RDATATYPE_SSHFP, 0, &fingerprints); | ||
48 | + DNS_RDATATYPE_SSHFP, rrset_flags, &fingerprints); | ||
49 | + | ||
50 | if (result) { | ||
51 | verbose("DNS lookup error: %s", dns_result_totext(result)); | ||
52 | return -1; | ||
53 | diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c | ||
54 | index dc6fe05..e061a29 100644 | ||
55 | --- a/openbsd-compat/getrrsetbyname.c | ||
56 | +++ b/openbsd-compat/getrrsetbyname.c | ||
57 | @@ -209,8 +209,8 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, | ||
58 | goto fail; | ||
59 | } | ||
60 | |||
61 | - /* don't allow flags yet, unimplemented */ | ||
62 | - if (flags) { | ||
63 | + /* Allow RRSET_FORCE_EDNS0 flag only. */ | ||
64 | + if ((flags & !RRSET_FORCE_EDNS0) != 0) { | ||
65 | result = ERRSET_INVAL; | ||
66 | goto fail; | ||
67 | } | ||
68 | @@ -226,9 +226,9 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, | ||
69 | #endif /* DEBUG */ | ||
70 | |||
71 | #ifdef RES_USE_DNSSEC | ||
72 | - /* turn on DNSSEC if EDNS0 is configured */ | ||
73 | - if (_resp->options & RES_USE_EDNS0) | ||
74 | - _resp->options |= RES_USE_DNSSEC; | ||
75 | + /* turn on DNSSEC if required */ | ||
76 | + if (flags & RRSET_FORCE_EDNS0) | ||
77 | + _resp->options |= (RES_USE_EDNS0|RES_USE_DNSSEC); | ||
78 | #endif /* RES_USE_DNSEC */ | ||
79 | |||
80 | /* make query */ | ||
81 | diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h | ||
82 | index 1283f55..dbbc85a 100644 | ||
83 | --- a/openbsd-compat/getrrsetbyname.h | ||
84 | +++ b/openbsd-compat/getrrsetbyname.h | ||
85 | @@ -72,6 +72,9 @@ | ||
86 | #ifndef RRSET_VALIDATED | ||
87 | # define RRSET_VALIDATED 1 | ||
88 | #endif | ||
89 | +#ifndef RRSET_FORCE_EDNS0 | ||
90 | +# define RRSET_FORCE_EDNS0 0x0001 | ||
91 | +#endif | ||
92 | |||
93 | /* | ||
94 | * Return codes for getrrsetbyname() | ||
diff --git a/debian/patches/doc-hash-tab-completion.patch b/debian/patches/doc-hash-tab-completion.patch new file mode 100644 index 000000000..6b21b2e93 --- /dev/null +++ b/debian/patches/doc-hash-tab-completion.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 5e0540a17ace7dbbcec332ad3828d09dfa69dc6f Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:11 +0000 | ||
4 | Subject: Document that HashKnownHosts may break tab-completion | ||
5 | |||
6 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1727 | ||
7 | Bug-Debian: http://bugs.debian.org/430154 | ||
8 | Last-Update: 2013-09-14 | ||
9 | |||
10 | Patch-Name: doc-hash-tab-completion.patch | ||
11 | --- | ||
12 | ssh_config.5 | 3 +++ | ||
13 | 1 file changed, 3 insertions(+) | ||
14 | |||
15 | diff --git a/ssh_config.5 b/ssh_config.5 | ||
16 | index 3c6b9d4..85f306c 100644 | ||
17 | --- a/ssh_config.5 | ||
18 | +++ b/ssh_config.5 | ||
19 | @@ -734,6 +734,9 @@ Note that existing names and addresses in known hosts files | ||
20 | will not be converted automatically, | ||
21 | but may be manually hashed using | ||
22 | .Xr ssh-keygen 1 . | ||
23 | +Use of this option may break facilities such as tab-completion that rely | ||
24 | +on being able to read unhashed host names from | ||
25 | +.Pa ~/.ssh/known_hosts . | ||
26 | .It Cm HostbasedAuthentication | ||
27 | Specifies whether to try rhosts based authentication with public key | ||
28 | authentication. | ||
diff --git a/debian/patches/doc-upstart.patch b/debian/patches/doc-upstart.patch new file mode 100644 index 000000000..a813eb0ab --- /dev/null +++ b/debian/patches/doc-upstart.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 61466f681be917753b4ae82f3b6b16cbb44047ae Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@ubuntu.com> | ||
3 | Date: Sun, 9 Feb 2014 16:10:12 +0000 | ||
4 | Subject: Refer to ssh's Upstart job as well as its init script | ||
5 | |||
6 | Forwarded: not-needed | ||
7 | Last-Update: 2013-09-14 | ||
8 | |||
9 | Patch-Name: doc-upstart.patch | ||
10 | --- | ||
11 | sshd.8 | 5 ++++- | ||
12 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/sshd.8 b/sshd.8 | ||
15 | index b016e90..cba168a 100644 | ||
16 | --- a/sshd.8 | ||
17 | +++ b/sshd.8 | ||
18 | @@ -70,7 +70,10 @@ over an insecure network. | ||
19 | .Nm | ||
20 | listens for connections from clients. | ||
21 | It is normally started at boot from | ||
22 | -.Pa /etc/init.d/ssh . | ||
23 | +.Pa /etc/init.d/ssh | ||
24 | +(or | ||
25 | +.Pa /etc/init/ssh.conf | ||
26 | +on systems using the Upstart init daemon). | ||
27 | It forks a new | ||
28 | daemon for each incoming connection. | ||
29 | The forked daemons handle | ||
diff --git a/debian/patches/fix-case-sensitive-matching.patch b/debian/patches/fix-case-sensitive-matching.patch new file mode 100644 index 000000000..820745cc1 --- /dev/null +++ b/debian/patches/fix-case-sensitive-matching.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From bdb60d16baf6d163844fc6f5f8520bc853b6611b Mon Sep 17 00:00:00 2001 | ||
2 | From: Damien Miller <djm@mindrot.org> | ||
3 | Date: Tue, 4 Feb 2014 11:26:04 +1100 | ||
4 | Subject: Unbreak case-sensitive matching of ssh_config | ||
5 | |||
6 | - djm@cvs.openbsd.org 2014/02/04 00:24:29 | ||
7 | [ssh.c] | ||
8 | delay lowercasing of hostname until right before hostname | ||
9 | canonicalisation to unbreak case-sensitive matching of ssh_config; | ||
10 | reported by Ike Devolder; ok markus@ | ||
11 | |||
12 | Origin: backport, https://anongit.mindrot.org/openssh.git/commit/?id=d56b44d2dfa093883a5c4e91be3f72d99946b170 | ||
13 | Bug-Debian: http://bugs.debian.org/738619 | ||
14 | Forwarded: not-needed | ||
15 | Last-Update: 2014-02-11 | ||
16 | |||
17 | Patch-Name: fix-case-sensitive-matching.patch | ||
18 | --- | ||
19 | ssh.c | 2 +- | ||
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
21 | |||
22 | diff --git a/ssh.c b/ssh.c | ||
23 | index 0cea713..5d5d4de 100644 | ||
24 | --- a/ssh.c | ||
25 | +++ b/ssh.c | ||
26 | @@ -780,7 +780,6 @@ main(int ac, char **av) | ||
27 | if (!host) | ||
28 | usage(); | ||
29 | |||
30 | - lowercase(host); | ||
31 | host_arg = xstrdup(host); | ||
32 | |||
33 | OpenSSL_add_all_algorithms(); | ||
34 | @@ -914,6 +913,7 @@ main(int ac, char **av) | ||
35 | } | ||
36 | |||
37 | /* If canonicalization requested then try to apply it */ | ||
38 | + lowercase(host); | ||
39 | if (options.canonicalize_hostname != SSH_CANONICALISE_NO) | ||
40 | addrs = resolve_canonicalize(&host, options.port); | ||
41 | /* | ||
diff --git a/debian/patches/gnome-ssh-askpass2-icon.patch b/debian/patches/gnome-ssh-askpass2-icon.patch new file mode 100644 index 000000000..c0ee03c3f --- /dev/null +++ b/debian/patches/gnome-ssh-askpass2-icon.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 1a6c95a5c5c82664f18bab6159e16cd64b07d870 Mon Sep 17 00:00:00 2001 | ||
2 | From: Vincent Untz <vuntz@ubuntu.com> | ||
3 | Date: Sun, 9 Feb 2014 16:10:16 +0000 | ||
4 | Subject: Give the ssh-askpass-gnome window a default icon | ||
5 | |||
6 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/27152 | ||
7 | Last-Update: 2010-02-28 | ||
8 | |||
9 | Patch-Name: gnome-ssh-askpass2-icon.patch | ||
10 | --- | ||
11 | contrib/gnome-ssh-askpass2.c | 2 ++ | ||
12 | 1 file changed, 2 insertions(+) | ||
13 | |||
14 | diff --git a/contrib/gnome-ssh-askpass2.c b/contrib/gnome-ssh-askpass2.c | ||
15 | index 9d97c30..04b3a11 100644 | ||
16 | --- a/contrib/gnome-ssh-askpass2.c | ||
17 | +++ b/contrib/gnome-ssh-askpass2.c | ||
18 | @@ -209,6 +209,8 @@ main(int argc, char **argv) | ||
19 | |||
20 | gtk_init(&argc, &argv); | ||
21 | |||
22 | + gtk_window_set_default_icon_from_file ("/usr/share/pixmaps/ssh-askpass-gnome.png", NULL); | ||
23 | + | ||
24 | if (argc > 1) { | ||
25 | message = g_strjoinv(" ", argv + 1); | ||
26 | } else { | ||
diff --git a/debian/patches/gssapi.patch b/debian/patches/gssapi.patch new file mode 100644 index 000000000..3f6fccfff --- /dev/null +++ b/debian/patches/gssapi.patch | |||
@@ -0,0 +1,3135 @@ | |||
1 | From cd404114ded78fc51d5d9cbd458d55c9b2f67daa Mon Sep 17 00:00:00 2001 | ||
2 | From: Simon Wilkinson <simon@sxw.org.uk> | ||
3 | Date: Sun, 9 Feb 2014 16:09:48 +0000 | ||
4 | Subject: GSSAPI key exchange support | ||
5 | |||
6 | This patch has been rejected upstream: "None of the OpenSSH developers are | ||
7 | in favour of adding this, and this situation has not changed for several | ||
8 | years. This is not a slight on Simon's patch, which is of fine quality, but | ||
9 | just that a) we don't trust GSSAPI implementations that much and b) we don't | ||
10 | like adding new KEX since they are pre-auth attack surface. This one is | ||
11 | particularly scary, since it requires hooks out to typically root-owned | ||
12 | system resources." | ||
13 | |||
14 | However, quite a lot of people rely on this in Debian, and it's better to | ||
15 | have 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 | ||
17 | security history. | ||
18 | |||
19 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1242 | ||
20 | Last-Updated: 2014-02-10 | ||
21 | |||
22 | Patch-Name: gssapi.patch | ||
23 | --- | ||
24 | ChangeLog.gssapi | 113 +++++++++++++++++++ | ||
25 | Makefile.in | 3 +- | ||
26 | auth-krb5.c | 17 ++- | ||
27 | auth2-gss.c | 48 +++++++- | ||
28 | auth2.c | 2 + | ||
29 | clientloop.c | 13 +++ | ||
30 | config.h.in | 6 + | ||
31 | configure | 57 ++++++++++ | ||
32 | configure.ac | 24 ++++ | ||
33 | gss-genr.c | 276 ++++++++++++++++++++++++++++++++++++++++++++- | ||
34 | gss-serv-krb5.c | 84 +++++++++++++- | ||
35 | gss-serv.c | 221 +++++++++++++++++++++++++++++++----- | ||
36 | kex.c | 16 +++ | ||
37 | kex.h | 14 +++ | ||
38 | kexgssc.c | 333 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
39 | kexgsss.c | 289 +++++++++++++++++++++++++++++++++++++++++++++++ | ||
40 | key.c | 1 + | ||
41 | key.h | 1 + | ||
42 | monitor.c | 108 +++++++++++++++++- | ||
43 | monitor.h | 3 + | ||
44 | monitor_wrap.c | 47 +++++++- | ||
45 | monitor_wrap.h | 4 +- | ||
46 | readconf.c | 42 +++++++ | ||
47 | readconf.h | 5 + | ||
48 | servconf.c | 38 ++++++- | ||
49 | servconf.h | 3 + | ||
50 | ssh-gss.h | 39 ++++++- | ||
51 | ssh_config | 2 + | ||
52 | ssh_config.5 | 34 +++++- | ||
53 | sshconnect2.c | 124 ++++++++++++++++++++- | ||
54 | sshd.c | 110 ++++++++++++++++++ | ||
55 | sshd_config | 2 + | ||
56 | sshd_config.5 | 28 +++++ | ||
57 | 33 files changed, 2050 insertions(+), 57 deletions(-) | ||
58 | create mode 100644 ChangeLog.gssapi | ||
59 | create mode 100644 kexgssc.c | ||
60 | create mode 100644 kexgsss.c | ||
61 | |||
62 | diff --git a/ChangeLog.gssapi b/ChangeLog.gssapi | ||
63 | new file mode 100644 | ||
64 | index 0000000..f117a33 | ||
65 | --- /dev/null | ||
66 | +++ b/ChangeLog.gssapi | ||
67 | @@ -0,0 +1,113 @@ | ||
68 | +20110101 | ||
69 | + - Finally update for OpenSSH 5.6p1 | ||
70 | + - Add GSSAPIServerIdentity option from Jim Basney | ||
71 | + | ||
72 | +20100308 | ||
73 | + - [ Makefile.in, key.c, key.h ] | ||
74 | + Updates for OpenSSH 5.4p1 | ||
75 | + - [ servconf.c ] | ||
76 | + Include GSSAPI options in the sshd -T configuration dump, and flag | ||
77 | + some older configuration options as being unsupported. Thanks to Colin | ||
78 | + Watson. | ||
79 | + - | ||
80 | + | ||
81 | +20100124 | ||
82 | + - [ sshconnect2.c ] | ||
83 | + Adapt to deal with additional element in Authmethod structure. Thanks to | ||
84 | + Colin Watson | ||
85 | + | ||
86 | +20090615 | ||
87 | + - [ gss-genr.c gss-serv.c kexgssc.c kexgsss.c monitor.c sshconnect2.c | ||
88 | + sshd.c ] | ||
89 | + Fix issues identified by Greg Hudson following a code review | ||
90 | + Check return value of gss_indicate_mechs | ||
91 | + Protect GSSAPI calls in monitor, so they can only be used if enabled | ||
92 | + Check return values of bignum functions in key exchange | ||
93 | + Use BN_clear_free to clear other side's DH value | ||
94 | + Make ssh_gssapi_id_kex more robust | ||
95 | + Only configure kex table pointers if GSSAPI is enabled | ||
96 | + Don't leak mechanism list, or gss mechanism list | ||
97 | + Cast data.length before printing | ||
98 | + If serverkey isn't provided, use an empty string, rather than NULL | ||
99 | + | ||
100 | +20090201 | ||
101 | + - [ gss-genr.c gss-serv.c kex.h kexgssc.c readconf.c readconf.h ssh-gss.h | ||
102 | + ssh_config.5 sshconnet2.c ] | ||
103 | + Add support for the GSSAPIClientIdentity option, which allows the user | ||
104 | + to specify which GSSAPI identity to use to contact a given server | ||
105 | + | ||
106 | +20080404 | ||
107 | + - [ gss-serv.c ] | ||
108 | + Add code to actually implement GSSAPIStrictAcceptCheck, which had somehow | ||
109 | + been omitted from a previous version of this patch. Reported by Borislav | ||
110 | + Stoichkov | ||
111 | + | ||
112 | +20070317 | ||
113 | + - [ gss-serv-krb5.c ] | ||
114 | + Remove C99ism, where new_ccname was being declared in the middle of a | ||
115 | + function | ||
116 | + | ||
117 | +20061220 | ||
118 | + - [ servconf.c ] | ||
119 | + Make default for GSSAPIStrictAcceptorCheck be Yes, to match previous, and | ||
120 | + documented, behaviour. Reported by Dan Watson. | ||
121 | + | ||
122 | +20060910 | ||
123 | + - [ gss-genr.c kexgssc.c kexgsss.c kex.h monitor.c sshconnect2.c sshd.c | ||
124 | + ssh-gss.h ] | ||
125 | + add support for gss-group14-sha1 key exchange mechanisms | ||
126 | + - [ gss-serv.c servconf.c servconf.h sshd_config sshd_config.5 ] | ||
127 | + Add GSSAPIStrictAcceptorCheck option to allow the disabling of | ||
128 | + acceptor principal checking on multi-homed machines. | ||
129 | + <Bugzilla #928> | ||
130 | + - [ sshd_config ssh_config ] | ||
131 | + Add settings for GSSAPIKeyExchange and GSSAPITrustDNS to the sample | ||
132 | + configuration files | ||
133 | + - [ kexgss.c kegsss.c sshconnect2.c sshd.c ] | ||
134 | + Code cleanup. Replace strlen/xmalloc/snprintf sequences with xasprintf() | ||
135 | + Limit length of error messages displayed by client | ||
136 | + | ||
137 | +20060909 | ||
138 | + - [ gss-genr.c gss-serv.c ] | ||
139 | + move ssh_gssapi_acquire_cred() and ssh_gssapi_server_ctx to be server | ||
140 | + only, where they belong | ||
141 | + <Bugzilla #1225> | ||
142 | + | ||
143 | +20060829 | ||
144 | + - [ gss-serv-krb5.c ] | ||
145 | + Fix CCAPI credentials cache name when creating KRB5CCNAME environment | ||
146 | + variable | ||
147 | + | ||
148 | +20060828 | ||
149 | + - [ gss-genr.c ] | ||
150 | + Avoid Heimdal context freeing problem | ||
151 | + <Fixed upstream 20060829> | ||
152 | + | ||
153 | +20060818 | ||
154 | + - [ gss-genr.c ssh-gss.h sshconnect2.c ] | ||
155 | + Make sure that SPENGO is disabled | ||
156 | + <Bugzilla #1218 - Fixed upstream 20060818> | ||
157 | + | ||
158 | +20060421 | ||
159 | + - [ gssgenr.c, sshconnect2.c ] | ||
160 | + a few type changes (signed versus unsigned, int versus size_t) to | ||
161 | + fix compiler errors/warnings | ||
162 | + (from jbasney AT ncsa.uiuc.edu) | ||
163 | + - [ kexgssc.c, sshconnect2.c ] | ||
164 | + fix uninitialized variable warnings | ||
165 | + (from jbasney AT ncsa.uiuc.edu) | ||
166 | + - [ gssgenr.c ] | ||
167 | + pass oid to gss_display_status (helpful when using GSSAPI mechglue) | ||
168 | + (from jbasney AT ncsa.uiuc.edu) | ||
169 | + <Bugzilla #1220 > | ||
170 | + - [ gss-serv-krb5.c ] | ||
171 | + #ifdef HAVE_GSSAPI_KRB5 should be #ifdef HAVE_GSSAPI_KRB5_H | ||
172 | + (from jbasney AT ncsa.uiuc.edu) | ||
173 | + <Fixed upstream 20060304> | ||
174 | + - [ readconf.c, readconf.h, ssh_config.5, sshconnect2.c | ||
175 | + add client-side GssapiKeyExchange option | ||
176 | + (from jbasney AT ncsa.uiuc.edu) | ||
177 | + - [ sshconnect2.c ] | ||
178 | + add support for GssapiTrustDns option for gssapi-with-mic | ||
179 | + (from jbasney AT ncsa.uiuc.edu) | ||
180 | + <gssapi-with-mic support is Bugzilla #1008> | ||
181 | diff --git a/Makefile.in b/Makefile.in | ||
182 | index a8aa127..35c6fd6 100644 | ||
183 | --- a/Makefile.in | ||
184 | +++ b/Makefile.in | ||
185 | @@ -72,6 +72,7 @@ LIBSSH_OBJS=authfd.o authfile.o bufaux.o bufbn.o buffer.o \ | ||
186 | atomicio.o key.o dispatch.o kex.o mac.o uidswap.o uuencode.o misc.o \ | ||
187 | monitor_fdpass.o rijndael.o ssh-dss.o ssh-ecdsa.o ssh-rsa.o dh.o \ | ||
188 | kexdh.o kexgex.o kexdhc.o kexgexc.o bufec.o kexecdh.o kexecdhc.o \ | ||
189 | + kexgssc.o \ | ||
190 | msg.o progressmeter.o dns.o entropy.o gss-genr.o umac.o umac128.o \ | ||
191 | jpake.o schnorr.o ssh-pkcs11.o krl.o smult_curve25519_ref.o \ | ||
192 | kexc25519.o kexc25519c.o poly1305.o chacha.o cipher-chachapoly.o \ | ||
193 | @@ -91,7 +92,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | ||
194 | auth2-none.o auth2-passwd.o auth2-pubkey.o auth2-jpake.o \ | ||
195 | monitor_mm.o monitor.o monitor_wrap.o kexdhs.o kexgexs.o kexecdhs.o \ | ||
196 | kexc25519s.o auth-krb5.o \ | ||
197 | - auth2-gss.o gss-serv.o gss-serv-krb5.o \ | ||
198 | + auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o \ | ||
199 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | ||
200 | sftp-server.o sftp-common.o \ | ||
201 | roaming_common.o roaming_serv.o \ | ||
202 | diff --git a/auth-krb5.c b/auth-krb5.c | ||
203 | index 6c62bdf..69a1a53 100644 | ||
204 | --- a/auth-krb5.c | ||
205 | +++ b/auth-krb5.c | ||
206 | @@ -182,8 +182,13 @@ auth_krb5_password(Authctxt *authctxt, const char *password) | ||
207 | |||
208 | len = strlen(authctxt->krb5_ticket_file) + 6; | ||
209 | authctxt->krb5_ccname = xmalloc(len); | ||
210 | +#ifdef USE_CCAPI | ||
211 | + snprintf(authctxt->krb5_ccname, len, "API:%s", | ||
212 | + authctxt->krb5_ticket_file); | ||
213 | +#else | ||
214 | snprintf(authctxt->krb5_ccname, len, "FILE:%s", | ||
215 | authctxt->krb5_ticket_file); | ||
216 | +#endif | ||
217 | |||
218 | #ifdef USE_PAM | ||
219 | if (options.use_pam) | ||
220 | @@ -240,15 +245,22 @@ krb5_cleanup_proc(Authctxt *authctxt) | ||
221 | #ifndef HEIMDAL | ||
222 | krb5_error_code | ||
223 | ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { | ||
224 | - int tmpfd, ret, oerrno; | ||
225 | + int ret, oerrno; | ||
226 | char ccname[40]; | ||
227 | mode_t old_umask; | ||
228 | +#ifdef USE_CCAPI | ||
229 | + char cctemplate[] = "API:krb5cc_%d"; | ||
230 | +#else | ||
231 | + char cctemplate[] = "FILE:/tmp/krb5cc_%d_XXXXXXXXXX"; | ||
232 | + int tmpfd; | ||
233 | +#endif | ||
234 | |||
235 | ret = snprintf(ccname, sizeof(ccname), | ||
236 | - "FILE:/tmp/krb5cc_%d_XXXXXXXXXX", geteuid()); | ||
237 | + cctemplate, geteuid()); | ||
238 | if (ret < 0 || (size_t)ret >= sizeof(ccname)) | ||
239 | return ENOMEM; | ||
240 | |||
241 | +#ifndef USE_CCAPI | ||
242 | old_umask = umask(0177); | ||
243 | tmpfd = mkstemp(ccname + strlen("FILE:")); | ||
244 | oerrno = errno; | ||
245 | @@ -265,6 +277,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) { | ||
246 | return oerrno; | ||
247 | } | ||
248 | close(tmpfd); | ||
249 | +#endif | ||
250 | |||
251 | return (krb5_cc_resolve(ctx, ccname, ccache)); | ||
252 | } | ||
253 | diff --git a/auth2-gss.c b/auth2-gss.c | ||
254 | index 638d8f8..b8db820 100644 | ||
255 | --- a/auth2-gss.c | ||
256 | +++ b/auth2-gss.c | ||
257 | @@ -1,7 +1,7 @@ | ||
258 | /* $OpenBSD: auth2-gss.c,v 1.20 2013/05/17 00:13:13 djm Exp $ */ | ||
259 | |||
260 | /* | ||
261 | - * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | ||
262 | + * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. | ||
263 | * | ||
264 | * Redistribution and use in source and binary forms, with or without | ||
265 | * modification, are permitted provided that the following conditions | ||
266 | @@ -52,6 +52,40 @@ static void input_gssapi_mic(int type, u_int32_t plen, void *ctxt); | ||
267 | static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); | ||
268 | static void input_gssapi_errtok(int, u_int32_t, void *); | ||
269 | |||
270 | +/* | ||
271 | + * The 'gssapi_keyex' userauth mechanism. | ||
272 | + */ | ||
273 | +static int | ||
274 | +userauth_gsskeyex(Authctxt *authctxt) | ||
275 | +{ | ||
276 | + int authenticated = 0; | ||
277 | + Buffer b; | ||
278 | + gss_buffer_desc mic, gssbuf; | ||
279 | + u_int len; | ||
280 | + | ||
281 | + mic.value = packet_get_string(&len); | ||
282 | + mic.length = len; | ||
283 | + | ||
284 | + packet_check_eom(); | ||
285 | + | ||
286 | + ssh_gssapi_buildmic(&b, authctxt->user, authctxt->service, | ||
287 | + "gssapi-keyex"); | ||
288 | + | ||
289 | + gssbuf.value = buffer_ptr(&b); | ||
290 | + gssbuf.length = buffer_len(&b); | ||
291 | + | ||
292 | + /* gss_kex_context is NULL with privsep, so we can't check it here */ | ||
293 | + if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gss_kex_context, | ||
294 | + &gssbuf, &mic)))) | ||
295 | + authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, | ||
296 | + authctxt->pw)); | ||
297 | + | ||
298 | + buffer_free(&b); | ||
299 | + free(mic.value); | ||
300 | + | ||
301 | + return (authenticated); | ||
302 | +} | ||
303 | + | ||
304 | /* | ||
305 | * We only support those mechanisms that we know about (ie ones that we know | ||
306 | * how to check local user kuserok and the like) | ||
307 | @@ -240,7 +274,8 @@ input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) | ||
308 | |||
309 | packet_check_eom(); | ||
310 | |||
311 | - authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); | ||
312 | + authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user, | ||
313 | + authctxt->pw)); | ||
314 | |||
315 | authctxt->postponed = 0; | ||
316 | dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); | ||
317 | @@ -275,7 +310,8 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt) | ||
318 | gssbuf.length = buffer_len(&b); | ||
319 | |||
320 | if (!GSS_ERROR(PRIVSEP(ssh_gssapi_checkmic(gssctxt, &gssbuf, &mic)))) | ||
321 | - authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); | ||
322 | + authenticated = | ||
323 | + PRIVSEP(ssh_gssapi_userok(authctxt->user, authctxt->pw)); | ||
324 | else | ||
325 | logit("GSSAPI MIC check failed"); | ||
326 | |||
327 | @@ -290,6 +326,12 @@ input_gssapi_mic(int type, u_int32_t plen, void *ctxt) | ||
328 | userauth_finish(authctxt, authenticated, "gssapi-with-mic", NULL); | ||
329 | } | ||
330 | |||
331 | +Authmethod method_gsskeyex = { | ||
332 | + "gssapi-keyex", | ||
333 | + userauth_gsskeyex, | ||
334 | + &options.gss_authentication | ||
335 | +}; | ||
336 | + | ||
337 | Authmethod method_gssapi = { | ||
338 | "gssapi-with-mic", | ||
339 | userauth_gssapi, | ||
340 | diff --git a/auth2.c b/auth2.c | ||
341 | index f0cab8c..6ed8f04 100644 | ||
342 | --- a/auth2.c | ||
343 | +++ b/auth2.c | ||
344 | @@ -69,6 +69,7 @@ extern Authmethod method_passwd; | ||
345 | extern Authmethod method_kbdint; | ||
346 | extern Authmethod method_hostbased; | ||
347 | #ifdef GSSAPI | ||
348 | +extern Authmethod method_gsskeyex; | ||
349 | extern Authmethod method_gssapi; | ||
350 | #endif | ||
351 | #ifdef JPAKE | ||
352 | @@ -79,6 +80,7 @@ Authmethod *authmethods[] = { | ||
353 | &method_none, | ||
354 | &method_pubkey, | ||
355 | #ifdef GSSAPI | ||
356 | + &method_gsskeyex, | ||
357 | &method_gssapi, | ||
358 | #endif | ||
359 | #ifdef JPAKE | ||
360 | diff --git a/clientloop.c b/clientloop.c | ||
361 | index f30c8b6..6d02b0b 100644 | ||
362 | --- a/clientloop.c | ||
363 | +++ b/clientloop.c | ||
364 | @@ -111,6 +111,10 @@ | ||
365 | #include "msg.h" | ||
366 | #include "roaming.h" | ||
367 | |||
368 | +#ifdef GSSAPI | ||
369 | +#include "ssh-gss.h" | ||
370 | +#endif | ||
371 | + | ||
372 | /* import options */ | ||
373 | extern Options options; | ||
374 | |||
375 | @@ -1608,6 +1612,15 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | ||
376 | /* Do channel operations unless rekeying in progress. */ | ||
377 | if (!rekeying) { | ||
378 | channel_after_select(readset, writeset); | ||
379 | + | ||
380 | +#ifdef GSSAPI | ||
381 | + if (options.gss_renewal_rekey && | ||
382 | + ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) { | ||
383 | + debug("credentials updated - forcing rekey"); | ||
384 | + need_rekeying = 1; | ||
385 | + } | ||
386 | +#endif | ||
387 | + | ||
388 | if (need_rekeying || packet_need_rekeying()) { | ||
389 | debug("need rekeying"); | ||
390 | xxx_kex->done = 0; | ||
391 | diff --git a/config.h.in b/config.h.in | ||
392 | index 075c619..906e549 100644 | ||
393 | --- a/config.h.in | ||
394 | +++ b/config.h.in | ||
395 | @@ -1616,6 +1616,9 @@ | ||
396 | /* Use btmp to log bad logins */ | ||
397 | #undef USE_BTMP | ||
398 | |||
399 | +/* platform uses an in-memory credentials cache */ | ||
400 | +#undef USE_CCAPI | ||
401 | + | ||
402 | /* Use libedit for sftp */ | ||
403 | #undef USE_LIBEDIT | ||
404 | |||
405 | @@ -1631,6 +1634,9 @@ | ||
406 | /* Use PIPES instead of a socketpair() */ | ||
407 | #undef USE_PIPES | ||
408 | |||
409 | +/* platform has the Security Authorization Session API */ | ||
410 | +#undef USE_SECURITY_SESSION_API | ||
411 | + | ||
412 | /* Define if you have Solaris process contracts */ | ||
413 | #undef USE_SOLARIS_PROCESS_CONTRACTS | ||
414 | |||
415 | diff --git a/configure b/configure | ||
416 | index 2d714ac..5a9db2d 100755 | ||
417 | --- a/configure | ||
418 | +++ b/configure | ||
419 | @@ -7170,6 +7170,63 @@ $as_echo "#define SSH_TUN_COMPAT_AF 1" >>confdefs.h | ||
420 | |||
421 | $as_echo "#define SSH_TUN_PREPEND_AF 1" >>confdefs.h | ||
422 | |||
423 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have the Security Authorization Session API" >&5 | ||
424 | +$as_echo_n "checking if we have the Security Authorization Session API... " >&6; } | ||
425 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
426 | +/* end confdefs.h. */ | ||
427 | +#include <Security/AuthSession.h> | ||
428 | +int | ||
429 | +main () | ||
430 | +{ | ||
431 | +SessionCreate(0, 0); | ||
432 | + ; | ||
433 | + return 0; | ||
434 | +} | ||
435 | +_ACEOF | ||
436 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
437 | + ac_cv_use_security_session_api="yes" | ||
438 | + | ||
439 | +$as_echo "#define USE_SECURITY_SESSION_API 1" >>confdefs.h | ||
440 | + | ||
441 | + LIBS="$LIBS -framework Security" | ||
442 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
443 | +$as_echo "yes" >&6; } | ||
444 | +else | ||
445 | + ac_cv_use_security_session_api="no" | ||
446 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
447 | +$as_echo "no" >&6; } | ||
448 | +fi | ||
449 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
450 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have an in-memory credentials cache" >&5 | ||
451 | +$as_echo_n "checking if we have an in-memory credentials cache... " >&6; } | ||
452 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
453 | +/* end confdefs.h. */ | ||
454 | +#include <Kerberos/Kerberos.h> | ||
455 | +int | ||
456 | +main () | ||
457 | +{ | ||
458 | +cc_context_t c; | ||
459 | + (void) cc_initialize (&c, 0, NULL, NULL); | ||
460 | + ; | ||
461 | + return 0; | ||
462 | +} | ||
463 | +_ACEOF | ||
464 | +if ac_fn_c_try_compile "$LINENO"; then : | ||
465 | + | ||
466 | +$as_echo "#define USE_CCAPI 1" >>confdefs.h | ||
467 | + | ||
468 | + LIBS="$LIBS -framework Security" | ||
469 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
470 | +$as_echo "yes" >&6; } | ||
471 | + if test "x$ac_cv_use_security_session_api" = "xno"; then | ||
472 | + as_fn_error $? "*** Need a security framework to use the credentials cache API ***" "$LINENO" 5 | ||
473 | + fi | ||
474 | +else | ||
475 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
476 | +$as_echo "no" >&6; } | ||
477 | + | ||
478 | +fi | ||
479 | +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
480 | |||
481 | ac_fn_c_check_decl "$LINENO" "AU_IPv4" "ac_cv_have_decl_AU_IPv4" "$ac_includes_default" | ||
482 | if test "x$ac_cv_have_decl_AU_IPv4" = xyes; then : | ||
483 | diff --git a/configure.ac b/configure.ac | ||
484 | index dfd32cd..90eebf5 100644 | ||
485 | --- a/configure.ac | ||
486 | +++ b/configure.ac | ||
487 | @@ -584,6 +584,30 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) | ||
488 | [Use tunnel device compatibility to OpenBSD]) | ||
489 | AC_DEFINE([SSH_TUN_PREPEND_AF], [1], | ||
490 | [Prepend the address family to IP tunnel traffic]) | ||
491 | + AC_MSG_CHECKING([if we have the Security Authorization Session API]) | ||
492 | + AC_TRY_COMPILE([#include <Security/AuthSession.h>], | ||
493 | + [SessionCreate(0, 0);], | ||
494 | + [ac_cv_use_security_session_api="yes" | ||
495 | + AC_DEFINE([USE_SECURITY_SESSION_API], [1], | ||
496 | + [platform has the Security Authorization Session API]) | ||
497 | + LIBS="$LIBS -framework Security" | ||
498 | + AC_MSG_RESULT([yes])], | ||
499 | + [ac_cv_use_security_session_api="no" | ||
500 | + AC_MSG_RESULT([no])]) | ||
501 | + AC_MSG_CHECKING([if we have an in-memory credentials cache]) | ||
502 | + AC_TRY_COMPILE( | ||
503 | + [#include <Kerberos/Kerberos.h>], | ||
504 | + [cc_context_t c; | ||
505 | + (void) cc_initialize (&c, 0, NULL, NULL);], | ||
506 | + [AC_DEFINE([USE_CCAPI], [1], | ||
507 | + [platform uses an in-memory credentials cache]) | ||
508 | + LIBS="$LIBS -framework Security" | ||
509 | + AC_MSG_RESULT([yes]) | ||
510 | + if test "x$ac_cv_use_security_session_api" = "xno"; then | ||
511 | + AC_MSG_ERROR([*** Need a security framework to use the credentials cache API ***]) | ||
512 | + fi], | ||
513 | + [AC_MSG_RESULT([no])] | ||
514 | + ) | ||
515 | m4_pattern_allow([AU_IPv]) | ||
516 | AC_CHECK_DECL([AU_IPv4], [], | ||
517 | AC_DEFINE([AU_IPv4], [0], [System only supports IPv4 audit records]) | ||
518 | diff --git a/gss-genr.c b/gss-genr.c | ||
519 | index b39281b..b7d1b7d 100644 | ||
520 | --- a/gss-genr.c | ||
521 | +++ b/gss-genr.c | ||
522 | @@ -1,7 +1,7 @@ | ||
523 | /* $OpenBSD: gss-genr.c,v 1.22 2013/11/08 00:39:15 djm Exp $ */ | ||
524 | |||
525 | /* | ||
526 | - * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. | ||
527 | + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. | ||
528 | * | ||
529 | * Redistribution and use in source and binary forms, with or without | ||
530 | * modification, are permitted provided that the following conditions | ||
531 | @@ -39,12 +39,167 @@ | ||
532 | #include "buffer.h" | ||
533 | #include "log.h" | ||
534 | #include "ssh2.h" | ||
535 | +#include "cipher.h" | ||
536 | +#include "key.h" | ||
537 | +#include "kex.h" | ||
538 | +#include <openssl/evp.h> | ||
539 | |||
540 | #include "ssh-gss.h" | ||
541 | |||
542 | extern u_char *session_id2; | ||
543 | extern u_int session_id2_len; | ||
544 | |||
545 | +typedef struct { | ||
546 | + char *encoded; | ||
547 | + gss_OID oid; | ||
548 | +} ssh_gss_kex_mapping; | ||
549 | + | ||
550 | +/* | ||
551 | + * XXX - It would be nice to find a more elegant way of handling the | ||
552 | + * XXX passing of the key exchange context to the userauth routines | ||
553 | + */ | ||
554 | + | ||
555 | +Gssctxt *gss_kex_context = NULL; | ||
556 | + | ||
557 | +static ssh_gss_kex_mapping *gss_enc2oid = NULL; | ||
558 | + | ||
559 | +int | ||
560 | +ssh_gssapi_oid_table_ok() { | ||
561 | + return (gss_enc2oid != NULL); | ||
562 | +} | ||
563 | + | ||
564 | +/* | ||
565 | + * Return a list of the gss-group1-sha1 mechanisms supported by this program | ||
566 | + * | ||
567 | + * We test mechanisms to ensure that we can use them, to avoid starting | ||
568 | + * a key exchange with a bad mechanism | ||
569 | + */ | ||
570 | + | ||
571 | +char * | ||
572 | +ssh_gssapi_client_mechanisms(const char *host, const char *client) { | ||
573 | + gss_OID_set gss_supported; | ||
574 | + OM_uint32 min_status; | ||
575 | + | ||
576 | + if (GSS_ERROR(gss_indicate_mechs(&min_status, &gss_supported))) | ||
577 | + return NULL; | ||
578 | + | ||
579 | + return(ssh_gssapi_kex_mechs(gss_supported, ssh_gssapi_check_mechanism, | ||
580 | + host, client)); | ||
581 | +} | ||
582 | + | ||
583 | +char * | ||
584 | +ssh_gssapi_kex_mechs(gss_OID_set gss_supported, ssh_gssapi_check_fn *check, | ||
585 | + const char *host, const char *client) { | ||
586 | + Buffer buf; | ||
587 | + size_t i; | ||
588 | + int oidpos, enclen; | ||
589 | + char *mechs, *encoded; | ||
590 | + u_char digest[EVP_MAX_MD_SIZE]; | ||
591 | + char deroid[2]; | ||
592 | + const EVP_MD *evp_md = EVP_md5(); | ||
593 | + EVP_MD_CTX md; | ||
594 | + | ||
595 | + if (gss_enc2oid != NULL) { | ||
596 | + for (i = 0; gss_enc2oid[i].encoded != NULL; i++) | ||
597 | + free(gss_enc2oid[i].encoded); | ||
598 | + free(gss_enc2oid); | ||
599 | + } | ||
600 | + | ||
601 | + gss_enc2oid = xmalloc(sizeof(ssh_gss_kex_mapping) * | ||
602 | + (gss_supported->count + 1)); | ||
603 | + | ||
604 | + buffer_init(&buf); | ||
605 | + | ||
606 | + oidpos = 0; | ||
607 | + for (i = 0; i < gss_supported->count; i++) { | ||
608 | + if (gss_supported->elements[i].length < 128 && | ||
609 | + (*check)(NULL, &(gss_supported->elements[i]), host, client)) { | ||
610 | + | ||
611 | + deroid[0] = SSH_GSS_OIDTYPE; | ||
612 | + deroid[1] = gss_supported->elements[i].length; | ||
613 | + | ||
614 | + EVP_DigestInit(&md, evp_md); | ||
615 | + EVP_DigestUpdate(&md, deroid, 2); | ||
616 | + EVP_DigestUpdate(&md, | ||
617 | + gss_supported->elements[i].elements, | ||
618 | + gss_supported->elements[i].length); | ||
619 | + EVP_DigestFinal(&md, digest, NULL); | ||
620 | + | ||
621 | + encoded = xmalloc(EVP_MD_size(evp_md) * 2); | ||
622 | + enclen = __b64_ntop(digest, EVP_MD_size(evp_md), | ||
623 | + encoded, EVP_MD_size(evp_md) * 2); | ||
624 | + | ||
625 | + if (oidpos != 0) | ||
626 | + buffer_put_char(&buf, ','); | ||
627 | + | ||
628 | + buffer_append(&buf, KEX_GSS_GEX_SHA1_ID, | ||
629 | + sizeof(KEX_GSS_GEX_SHA1_ID) - 1); | ||
630 | + buffer_append(&buf, encoded, enclen); | ||
631 | + buffer_put_char(&buf, ','); | ||
632 | + buffer_append(&buf, KEX_GSS_GRP1_SHA1_ID, | ||
633 | + sizeof(KEX_GSS_GRP1_SHA1_ID) - 1); | ||
634 | + buffer_append(&buf, encoded, enclen); | ||
635 | + buffer_put_char(&buf, ','); | ||
636 | + buffer_append(&buf, KEX_GSS_GRP14_SHA1_ID, | ||
637 | + sizeof(KEX_GSS_GRP14_SHA1_ID) - 1); | ||
638 | + buffer_append(&buf, encoded, enclen); | ||
639 | + | ||
640 | + gss_enc2oid[oidpos].oid = &(gss_supported->elements[i]); | ||
641 | + gss_enc2oid[oidpos].encoded = encoded; | ||
642 | + oidpos++; | ||
643 | + } | ||
644 | + } | ||
645 | + gss_enc2oid[oidpos].oid = NULL; | ||
646 | + gss_enc2oid[oidpos].encoded = NULL; | ||
647 | + | ||
648 | + buffer_put_char(&buf, '\0'); | ||
649 | + | ||
650 | + mechs = xmalloc(buffer_len(&buf)); | ||
651 | + buffer_get(&buf, mechs, buffer_len(&buf)); | ||
652 | + buffer_free(&buf); | ||
653 | + | ||
654 | + if (strlen(mechs) == 0) { | ||
655 | + free(mechs); | ||
656 | + mechs = NULL; | ||
657 | + } | ||
658 | + | ||
659 | + return (mechs); | ||
660 | +} | ||
661 | + | ||
662 | +gss_OID | ||
663 | +ssh_gssapi_id_kex(Gssctxt *ctx, char *name, int kex_type) { | ||
664 | + int i = 0; | ||
665 | + | ||
666 | + switch (kex_type) { | ||
667 | + case KEX_GSS_GRP1_SHA1: | ||
668 | + if (strlen(name) < sizeof(KEX_GSS_GRP1_SHA1_ID)) | ||
669 | + return GSS_C_NO_OID; | ||
670 | + name += sizeof(KEX_GSS_GRP1_SHA1_ID) - 1; | ||
671 | + break; | ||
672 | + case KEX_GSS_GRP14_SHA1: | ||
673 | + if (strlen(name) < sizeof(KEX_GSS_GRP14_SHA1_ID)) | ||
674 | + return GSS_C_NO_OID; | ||
675 | + name += sizeof(KEX_GSS_GRP14_SHA1_ID) - 1; | ||
676 | + break; | ||
677 | + case KEX_GSS_GEX_SHA1: | ||
678 | + if (strlen(name) < sizeof(KEX_GSS_GEX_SHA1_ID)) | ||
679 | + return GSS_C_NO_OID; | ||
680 | + name += sizeof(KEX_GSS_GEX_SHA1_ID) - 1; | ||
681 | + break; | ||
682 | + default: | ||
683 | + return GSS_C_NO_OID; | ||
684 | + } | ||
685 | + | ||
686 | + while (gss_enc2oid[i].encoded != NULL && | ||
687 | + strcmp(name, gss_enc2oid[i].encoded) != 0) | ||
688 | + i++; | ||
689 | + | ||
690 | + if (gss_enc2oid[i].oid != NULL && ctx != NULL) | ||
691 | + ssh_gssapi_set_oid(ctx, gss_enc2oid[i].oid); | ||
692 | + | ||
693 | + return gss_enc2oid[i].oid; | ||
694 | +} | ||
695 | + | ||
696 | /* Check that the OID in a data stream matches that in the context */ | ||
697 | int | ||
698 | ssh_gssapi_check_oid(Gssctxt *ctx, void *data, size_t len) | ||
699 | @@ -197,7 +352,7 @@ ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok, | ||
700 | } | ||
701 | |||
702 | ctx->major = gss_init_sec_context(&ctx->minor, | ||
703 | - GSS_C_NO_CREDENTIAL, &ctx->context, ctx->name, ctx->oid, | ||
704 | + ctx->client_creds, &ctx->context, ctx->name, ctx->oid, | ||
705 | GSS_C_MUTUAL_FLAG | GSS_C_INTEG_FLAG | deleg_flag, | ||
706 | 0, NULL, recv_tok, NULL, send_tok, flags, NULL); | ||
707 | |||
708 | @@ -227,8 +382,42 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host) | ||
709 | } | ||
710 | |||
711 | OM_uint32 | ||
712 | +ssh_gssapi_client_identity(Gssctxt *ctx, const char *name) | ||
713 | +{ | ||
714 | + gss_buffer_desc gssbuf; | ||
715 | + gss_name_t gssname; | ||
716 | + OM_uint32 status; | ||
717 | + gss_OID_set oidset; | ||
718 | + | ||
719 | + gssbuf.value = (void *) name; | ||
720 | + gssbuf.length = strlen(gssbuf.value); | ||
721 | + | ||
722 | + gss_create_empty_oid_set(&status, &oidset); | ||
723 | + gss_add_oid_set_member(&status, ctx->oid, &oidset); | ||
724 | + | ||
725 | + ctx->major = gss_import_name(&ctx->minor, &gssbuf, | ||
726 | + GSS_C_NT_USER_NAME, &gssname); | ||
727 | + | ||
728 | + if (!ctx->major) | ||
729 | + ctx->major = gss_acquire_cred(&ctx->minor, | ||
730 | + gssname, 0, oidset, GSS_C_INITIATE, | ||
731 | + &ctx->client_creds, NULL, NULL); | ||
732 | + | ||
733 | + gss_release_name(&status, &gssname); | ||
734 | + gss_release_oid_set(&status, &oidset); | ||
735 | + | ||
736 | + if (ctx->major) | ||
737 | + ssh_gssapi_error(ctx); | ||
738 | + | ||
739 | + return(ctx->major); | ||
740 | +} | ||
741 | + | ||
742 | +OM_uint32 | ||
743 | ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) | ||
744 | { | ||
745 | + if (ctx == NULL) | ||
746 | + return -1; | ||
747 | + | ||
748 | if ((ctx->major = gss_get_mic(&ctx->minor, ctx->context, | ||
749 | GSS_C_QOP_DEFAULT, buffer, hash))) | ||
750 | ssh_gssapi_error(ctx); | ||
751 | @@ -236,6 +425,19 @@ ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_t buffer, gss_buffer_t hash) | ||
752 | return (ctx->major); | ||
753 | } | ||
754 | |||
755 | +/* Priviledged when used by server */ | ||
756 | +OM_uint32 | ||
757 | +ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) | ||
758 | +{ | ||
759 | + if (ctx == NULL) | ||
760 | + return -1; | ||
761 | + | ||
762 | + ctx->major = gss_verify_mic(&ctx->minor, ctx->context, | ||
763 | + gssbuf, gssmic, NULL); | ||
764 | + | ||
765 | + return (ctx->major); | ||
766 | +} | ||
767 | + | ||
768 | void | ||
769 | ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, | ||
770 | const char *context) | ||
771 | @@ -249,11 +451,16 @@ ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service, | ||
772 | } | ||
773 | |||
774 | int | ||
775 | -ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) | ||
776 | +ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host, | ||
777 | + const char *client) | ||
778 | { | ||
779 | gss_buffer_desc token = GSS_C_EMPTY_BUFFER; | ||
780 | OM_uint32 major, minor; | ||
781 | gss_OID_desc spnego_oid = {6, (void *)"\x2B\x06\x01\x05\x05\x02"}; | ||
782 | + Gssctxt *intctx = NULL; | ||
783 | + | ||
784 | + if (ctx == NULL) | ||
785 | + ctx = &intctx; | ||
786 | |||
787 | /* RFC 4462 says we MUST NOT do SPNEGO */ | ||
788 | if (oid->length == spnego_oid.length && | ||
789 | @@ -263,6 +470,10 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) | ||
790 | ssh_gssapi_build_ctx(ctx); | ||
791 | ssh_gssapi_set_oid(*ctx, oid); | ||
792 | major = ssh_gssapi_import_name(*ctx, host); | ||
793 | + | ||
794 | + if (!GSS_ERROR(major) && client) | ||
795 | + major = ssh_gssapi_client_identity(*ctx, client); | ||
796 | + | ||
797 | if (!GSS_ERROR(major)) { | ||
798 | major = ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, | ||
799 | NULL); | ||
800 | @@ -272,10 +483,67 @@ ssh_gssapi_check_mechanism(Gssctxt **ctx, gss_OID oid, const char *host) | ||
801 | GSS_C_NO_BUFFER); | ||
802 | } | ||
803 | |||
804 | - if (GSS_ERROR(major)) | ||
805 | + if (GSS_ERROR(major) || intctx != NULL) | ||
806 | ssh_gssapi_delete_ctx(ctx); | ||
807 | |||
808 | return (!GSS_ERROR(major)); | ||
809 | } | ||
810 | |||
811 | +int | ||
812 | +ssh_gssapi_credentials_updated(Gssctxt *ctxt) { | ||
813 | + static gss_name_t saved_name = GSS_C_NO_NAME; | ||
814 | + static OM_uint32 saved_lifetime = 0; | ||
815 | + static gss_OID saved_mech = GSS_C_NO_OID; | ||
816 | + static gss_name_t name; | ||
817 | + static OM_uint32 last_call = 0; | ||
818 | + OM_uint32 lifetime, now, major, minor; | ||
819 | + int equal; | ||
820 | + gss_cred_usage_t usage = GSS_C_INITIATE; | ||
821 | + | ||
822 | + now = time(NULL); | ||
823 | + | ||
824 | + if (ctxt) { | ||
825 | + debug("Rekey has happened - updating saved versions"); | ||
826 | + | ||
827 | + if (saved_name != GSS_C_NO_NAME) | ||
828 | + gss_release_name(&minor, &saved_name); | ||
829 | + | ||
830 | + major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, | ||
831 | + &saved_name, &saved_lifetime, NULL, NULL); | ||
832 | + | ||
833 | + if (!GSS_ERROR(major)) { | ||
834 | + saved_mech = ctxt->oid; | ||
835 | + saved_lifetime+= now; | ||
836 | + } else { | ||
837 | + /* Handle the error */ | ||
838 | + } | ||
839 | + return 0; | ||
840 | + } | ||
841 | + | ||
842 | + if (now - last_call < 10) | ||
843 | + return 0; | ||
844 | + | ||
845 | + last_call = now; | ||
846 | + | ||
847 | + if (saved_mech == GSS_C_NO_OID) | ||
848 | + return 0; | ||
849 | + | ||
850 | + major = gss_inquire_cred(&minor, GSS_C_NO_CREDENTIAL, | ||
851 | + &name, &lifetime, NULL, NULL); | ||
852 | + if (major == GSS_S_CREDENTIALS_EXPIRED) | ||
853 | + return 0; | ||
854 | + else if (GSS_ERROR(major)) | ||
855 | + return 0; | ||
856 | + | ||
857 | + major = gss_compare_name(&minor, saved_name, name, &equal); | ||
858 | + gss_release_name(&minor, &name); | ||
859 | + if (GSS_ERROR(major)) | ||
860 | + return 0; | ||
861 | + | ||
862 | + if (equal && (saved_lifetime < lifetime + now - 10)) | ||
863 | + return 1; | ||
864 | + | ||
865 | + return 0; | ||
866 | +} | ||
867 | + | ||
868 | #endif /* GSSAPI */ | ||
869 | diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c | ||
870 | index 759fa10..959a77e 100644 | ||
871 | --- a/gss-serv-krb5.c | ||
872 | +++ b/gss-serv-krb5.c | ||
873 | @@ -1,7 +1,7 @@ | ||
874 | /* $OpenBSD: gss-serv-krb5.c,v 1.8 2013/07/20 01:55:13 djm Exp $ */ | ||
875 | |||
876 | /* | ||
877 | - * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | ||
878 | + * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved. | ||
879 | * | ||
880 | * Redistribution and use in source and binary forms, with or without | ||
881 | * modification, are permitted provided that the following conditions | ||
882 | @@ -122,6 +122,7 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) | ||
883 | OM_uint32 maj_status, min_status; | ||
884 | int len; | ||
885 | const char *errmsg; | ||
886 | + const char *new_ccname; | ||
887 | |||
888 | if (client->creds == NULL) { | ||
889 | debug("No credentials stored"); | ||
890 | @@ -180,11 +181,16 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) | ||
891 | return; | ||
892 | } | ||
893 | |||
894 | - client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); | ||
895 | + new_ccname = krb5_cc_get_name(krb_context, ccache); | ||
896 | + | ||
897 | client->store.envvar = "KRB5CCNAME"; | ||
898 | - len = strlen(client->store.filename) + 6; | ||
899 | - client->store.envval = xmalloc(len); | ||
900 | - snprintf(client->store.envval, len, "FILE:%s", client->store.filename); | ||
901 | +#ifdef USE_CCAPI | ||
902 | + xasprintf(&client->store.envval, "API:%s", new_ccname); | ||
903 | + client->store.filename = NULL; | ||
904 | +#else | ||
905 | + xasprintf(&client->store.envval, "FILE:%s", new_ccname); | ||
906 | + client->store.filename = xstrdup(new_ccname); | ||
907 | +#endif | ||
908 | |||
909 | #ifdef USE_PAM | ||
910 | if (options.use_pam) | ||
911 | @@ -196,6 +202,71 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) | ||
912 | return; | ||
913 | } | ||
914 | |||
915 | +int | ||
916 | +ssh_gssapi_krb5_updatecreds(ssh_gssapi_ccache *store, | ||
917 | + ssh_gssapi_client *client) | ||
918 | +{ | ||
919 | + krb5_ccache ccache = NULL; | ||
920 | + krb5_principal principal = NULL; | ||
921 | + char *name = NULL; | ||
922 | + krb5_error_code problem; | ||
923 | + OM_uint32 maj_status, min_status; | ||
924 | + | ||
925 | + if ((problem = krb5_cc_resolve(krb_context, store->envval, &ccache))) { | ||
926 | + logit("krb5_cc_resolve(): %.100s", | ||
927 | + krb5_get_err_text(krb_context, problem)); | ||
928 | + return 0; | ||
929 | + } | ||
930 | + | ||
931 | + /* Find out who the principal in this cache is */ | ||
932 | + if ((problem = krb5_cc_get_principal(krb_context, ccache, | ||
933 | + &principal))) { | ||
934 | + logit("krb5_cc_get_principal(): %.100s", | ||
935 | + krb5_get_err_text(krb_context, problem)); | ||
936 | + krb5_cc_close(krb_context, ccache); | ||
937 | + return 0; | ||
938 | + } | ||
939 | + | ||
940 | + if ((problem = krb5_unparse_name(krb_context, principal, &name))) { | ||
941 | + logit("krb5_unparse_name(): %.100s", | ||
942 | + krb5_get_err_text(krb_context, problem)); | ||
943 | + krb5_free_principal(krb_context, principal); | ||
944 | + krb5_cc_close(krb_context, ccache); | ||
945 | + return 0; | ||
946 | + } | ||
947 | + | ||
948 | + | ||
949 | + if (strcmp(name,client->exportedname.value)!=0) { | ||
950 | + debug("Name in local credentials cache differs. Not storing"); | ||
951 | + krb5_free_principal(krb_context, principal); | ||
952 | + krb5_cc_close(krb_context, ccache); | ||
953 | + krb5_free_unparsed_name(krb_context, name); | ||
954 | + return 0; | ||
955 | + } | ||
956 | + krb5_free_unparsed_name(krb_context, name); | ||
957 | + | ||
958 | + /* Name matches, so lets get on with it! */ | ||
959 | + | ||
960 | + if ((problem = krb5_cc_initialize(krb_context, ccache, principal))) { | ||
961 | + logit("krb5_cc_initialize(): %.100s", | ||
962 | + krb5_get_err_text(krb_context, problem)); | ||
963 | + krb5_free_principal(krb_context, principal); | ||
964 | + krb5_cc_close(krb_context, ccache); | ||
965 | + return 0; | ||
966 | + } | ||
967 | + | ||
968 | + krb5_free_principal(krb_context, principal); | ||
969 | + | ||
970 | + if ((maj_status = gss_krb5_copy_ccache(&min_status, client->creds, | ||
971 | + ccache))) { | ||
972 | + logit("gss_krb5_copy_ccache() failed. Sorry!"); | ||
973 | + krb5_cc_close(krb_context, ccache); | ||
974 | + return 0; | ||
975 | + } | ||
976 | + | ||
977 | + return 1; | ||
978 | +} | ||
979 | + | ||
980 | ssh_gssapi_mech gssapi_kerberos_mech = { | ||
981 | "toWM5Slw5Ew8Mqkay+al2g==", | ||
982 | "Kerberos", | ||
983 | @@ -203,7 +274,8 @@ ssh_gssapi_mech gssapi_kerberos_mech = { | ||
984 | NULL, | ||
985 | &ssh_gssapi_krb5_userok, | ||
986 | NULL, | ||
987 | - &ssh_gssapi_krb5_storecreds | ||
988 | + &ssh_gssapi_krb5_storecreds, | ||
989 | + &ssh_gssapi_krb5_updatecreds | ||
990 | }; | ||
991 | |||
992 | #endif /* KRB5 */ | ||
993 | diff --git a/gss-serv.c b/gss-serv.c | ||
994 | index 95348e2..97f366f 100644 | ||
995 | --- a/gss-serv.c | ||
996 | +++ b/gss-serv.c | ||
997 | @@ -1,7 +1,7 @@ | ||
998 | /* $OpenBSD: gss-serv.c,v 1.24 2013/07/20 01:55:13 djm Exp $ */ | ||
999 | |||
1000 | /* | ||
1001 | - * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | ||
1002 | + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. | ||
1003 | * | ||
1004 | * Redistribution and use in source and binary forms, with or without | ||
1005 | * modification, are permitted provided that the following conditions | ||
1006 | @@ -45,15 +45,21 @@ | ||
1007 | #include "channels.h" | ||
1008 | #include "session.h" | ||
1009 | #include "misc.h" | ||
1010 | +#include "servconf.h" | ||
1011 | +#include "uidswap.h" | ||
1012 | |||
1013 | #include "ssh-gss.h" | ||
1014 | +#include "monitor_wrap.h" | ||
1015 | + | ||
1016 | +extern ServerOptions options; | ||
1017 | |||
1018 | static ssh_gssapi_client gssapi_client = | ||
1019 | { GSS_C_EMPTY_BUFFER, GSS_C_EMPTY_BUFFER, | ||
1020 | - GSS_C_NO_CREDENTIAL, NULL, {NULL, NULL, NULL, NULL}}; | ||
1021 | + GSS_C_NO_CREDENTIAL, GSS_C_NO_NAME, NULL, | ||
1022 | + {NULL, NULL, NULL, NULL, NULL}, 0, 0}; | ||
1023 | |||
1024 | ssh_gssapi_mech gssapi_null_mech = | ||
1025 | - { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL}; | ||
1026 | + { NULL, NULL, {0, NULL}, NULL, NULL, NULL, NULL, NULL}; | ||
1027 | |||
1028 | #ifdef KRB5 | ||
1029 | extern ssh_gssapi_mech gssapi_kerberos_mech; | ||
1030 | @@ -81,25 +87,32 @@ ssh_gssapi_acquire_cred(Gssctxt *ctx) | ||
1031 | char lname[MAXHOSTNAMELEN]; | ||
1032 | gss_OID_set oidset; | ||
1033 | |||
1034 | - gss_create_empty_oid_set(&status, &oidset); | ||
1035 | - gss_add_oid_set_member(&status, ctx->oid, &oidset); | ||
1036 | + if (options.gss_strict_acceptor) { | ||
1037 | + gss_create_empty_oid_set(&status, &oidset); | ||
1038 | + gss_add_oid_set_member(&status, ctx->oid, &oidset); | ||
1039 | |||
1040 | - if (gethostname(lname, MAXHOSTNAMELEN)) { | ||
1041 | - gss_release_oid_set(&status, &oidset); | ||
1042 | - return (-1); | ||
1043 | - } | ||
1044 | + if (gethostname(lname, MAXHOSTNAMELEN)) { | ||
1045 | + gss_release_oid_set(&status, &oidset); | ||
1046 | + return (-1); | ||
1047 | + } | ||
1048 | + | ||
1049 | + if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { | ||
1050 | + gss_release_oid_set(&status, &oidset); | ||
1051 | + return (ctx->major); | ||
1052 | + } | ||
1053 | + | ||
1054 | + if ((ctx->major = gss_acquire_cred(&ctx->minor, | ||
1055 | + ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, | ||
1056 | + NULL, NULL))) | ||
1057 | + ssh_gssapi_error(ctx); | ||
1058 | |||
1059 | - if (GSS_ERROR(ssh_gssapi_import_name(ctx, lname))) { | ||
1060 | gss_release_oid_set(&status, &oidset); | ||
1061 | return (ctx->major); | ||
1062 | + } else { | ||
1063 | + ctx->name = GSS_C_NO_NAME; | ||
1064 | + ctx->creds = GSS_C_NO_CREDENTIAL; | ||
1065 | } | ||
1066 | - | ||
1067 | - if ((ctx->major = gss_acquire_cred(&ctx->minor, | ||
1068 | - ctx->name, 0, oidset, GSS_C_ACCEPT, &ctx->creds, NULL, NULL))) | ||
1069 | - ssh_gssapi_error(ctx); | ||
1070 | - | ||
1071 | - gss_release_oid_set(&status, &oidset); | ||
1072 | - return (ctx->major); | ||
1073 | + return GSS_S_COMPLETE; | ||
1074 | } | ||
1075 | |||
1076 | /* Privileged */ | ||
1077 | @@ -114,6 +127,29 @@ ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid) | ||
1078 | } | ||
1079 | |||
1080 | /* Unprivileged */ | ||
1081 | +char * | ||
1082 | +ssh_gssapi_server_mechanisms() { | ||
1083 | + gss_OID_set supported; | ||
1084 | + | ||
1085 | + ssh_gssapi_supported_oids(&supported); | ||
1086 | + return (ssh_gssapi_kex_mechs(supported, &ssh_gssapi_server_check_mech, | ||
1087 | + NULL, NULL)); | ||
1088 | +} | ||
1089 | + | ||
1090 | +/* Unprivileged */ | ||
1091 | +int | ||
1092 | +ssh_gssapi_server_check_mech(Gssctxt **dum, gss_OID oid, const char *data, | ||
1093 | + const char *dummy) { | ||
1094 | + Gssctxt *ctx = NULL; | ||
1095 | + int res; | ||
1096 | + | ||
1097 | + res = !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, oid))); | ||
1098 | + ssh_gssapi_delete_ctx(&ctx); | ||
1099 | + | ||
1100 | + return (res); | ||
1101 | +} | ||
1102 | + | ||
1103 | +/* Unprivileged */ | ||
1104 | void | ||
1105 | ssh_gssapi_supported_oids(gss_OID_set *oidset) | ||
1106 | { | ||
1107 | @@ -123,7 +159,9 @@ ssh_gssapi_supported_oids(gss_OID_set *oidset) | ||
1108 | gss_OID_set supported; | ||
1109 | |||
1110 | gss_create_empty_oid_set(&min_status, oidset); | ||
1111 | - gss_indicate_mechs(&min_status, &supported); | ||
1112 | + | ||
1113 | + if (GSS_ERROR(gss_indicate_mechs(&min_status, &supported))) | ||
1114 | + return; | ||
1115 | |||
1116 | while (supported_mechs[i]->name != NULL) { | ||
1117 | if (GSS_ERROR(gss_test_oid_set_member(&min_status, | ||
1118 | @@ -249,8 +287,48 @@ OM_uint32 | ||
1119 | ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) | ||
1120 | { | ||
1121 | int i = 0; | ||
1122 | + int equal = 0; | ||
1123 | + gss_name_t new_name = GSS_C_NO_NAME; | ||
1124 | + gss_buffer_desc ename = GSS_C_EMPTY_BUFFER; | ||
1125 | + | ||
1126 | + if (options.gss_store_rekey && client->used && ctx->client_creds) { | ||
1127 | + if (client->mech->oid.length != ctx->oid->length || | ||
1128 | + (memcmp(client->mech->oid.elements, | ||
1129 | + ctx->oid->elements, ctx->oid->length) !=0)) { | ||
1130 | + debug("Rekeyed credentials have different mechanism"); | ||
1131 | + return GSS_S_COMPLETE; | ||
1132 | + } | ||
1133 | + | ||
1134 | + if ((ctx->major = gss_inquire_cred_by_mech(&ctx->minor, | ||
1135 | + ctx->client_creds, ctx->oid, &new_name, | ||
1136 | + NULL, NULL, NULL))) { | ||
1137 | + ssh_gssapi_error(ctx); | ||
1138 | + return (ctx->major); | ||
1139 | + } | ||
1140 | + | ||
1141 | + ctx->major = gss_compare_name(&ctx->minor, client->name, | ||
1142 | + new_name, &equal); | ||
1143 | |||
1144 | - gss_buffer_desc ename; | ||
1145 | + if (GSS_ERROR(ctx->major)) { | ||
1146 | + ssh_gssapi_error(ctx); | ||
1147 | + return (ctx->major); | ||
1148 | + } | ||
1149 | + | ||
1150 | + if (!equal) { | ||
1151 | + debug("Rekeyed credentials have different name"); | ||
1152 | + return GSS_S_COMPLETE; | ||
1153 | + } | ||
1154 | + | ||
1155 | + debug("Marking rekeyed credentials for export"); | ||
1156 | + | ||
1157 | + gss_release_name(&ctx->minor, &client->name); | ||
1158 | + gss_release_cred(&ctx->minor, &client->creds); | ||
1159 | + client->name = new_name; | ||
1160 | + client->creds = ctx->client_creds; | ||
1161 | + ctx->client_creds = GSS_C_NO_CREDENTIAL; | ||
1162 | + client->updated = 1; | ||
1163 | + return GSS_S_COMPLETE; | ||
1164 | + } | ||
1165 | |||
1166 | client->mech = NULL; | ||
1167 | |||
1168 | @@ -265,6 +343,13 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) | ||
1169 | if (client->mech == NULL) | ||
1170 | return GSS_S_FAILURE; | ||
1171 | |||
1172 | + if (ctx->client_creds && | ||
1173 | + (ctx->major = gss_inquire_cred_by_mech(&ctx->minor, | ||
1174 | + ctx->client_creds, ctx->oid, &client->name, NULL, NULL, NULL))) { | ||
1175 | + ssh_gssapi_error(ctx); | ||
1176 | + return (ctx->major); | ||
1177 | + } | ||
1178 | + | ||
1179 | if ((ctx->major = gss_display_name(&ctx->minor, ctx->client, | ||
1180 | &client->displayname, NULL))) { | ||
1181 | ssh_gssapi_error(ctx); | ||
1182 | @@ -282,6 +367,8 @@ ssh_gssapi_getclient(Gssctxt *ctx, ssh_gssapi_client *client) | ||
1183 | return (ctx->major); | ||
1184 | } | ||
1185 | |||
1186 | + gss_release_buffer(&ctx->minor, &ename); | ||
1187 | + | ||
1188 | /* We can't copy this structure, so we just move the pointer to it */ | ||
1189 | client->creds = ctx->client_creds; | ||
1190 | ctx->client_creds = GSS_C_NO_CREDENTIAL; | ||
1191 | @@ -329,7 +416,7 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep) | ||
1192 | |||
1193 | /* Privileged */ | ||
1194 | int | ||
1195 | -ssh_gssapi_userok(char *user) | ||
1196 | +ssh_gssapi_userok(char *user, struct passwd *pw) | ||
1197 | { | ||
1198 | OM_uint32 lmin; | ||
1199 | |||
1200 | @@ -339,9 +426,11 @@ ssh_gssapi_userok(char *user) | ||
1201 | return 0; | ||
1202 | } | ||
1203 | if (gssapi_client.mech && gssapi_client.mech->userok) | ||
1204 | - if ((*gssapi_client.mech->userok)(&gssapi_client, user)) | ||
1205 | + if ((*gssapi_client.mech->userok)(&gssapi_client, user)) { | ||
1206 | + gssapi_client.used = 1; | ||
1207 | + gssapi_client.store.owner = pw; | ||
1208 | return 1; | ||
1209 | - else { | ||
1210 | + } else { | ||
1211 | /* Destroy delegated credentials if userok fails */ | ||
1212 | gss_release_buffer(&lmin, &gssapi_client.displayname); | ||
1213 | gss_release_buffer(&lmin, &gssapi_client.exportedname); | ||
1214 | @@ -354,14 +443,90 @@ ssh_gssapi_userok(char *user) | ||
1215 | return (0); | ||
1216 | } | ||
1217 | |||
1218 | -/* Privileged */ | ||
1219 | -OM_uint32 | ||
1220 | -ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) | ||
1221 | +/* These bits are only used for rekeying. The unpriviledged child is running | ||
1222 | + * as the user, the monitor is root. | ||
1223 | + * | ||
1224 | + * In the child, we want to : | ||
1225 | + * *) Ask the monitor to store our credentials into the store we specify | ||
1226 | + * *) If it succeeds, maybe do a PAM update | ||
1227 | + */ | ||
1228 | + | ||
1229 | +/* Stuff for PAM */ | ||
1230 | + | ||
1231 | +#ifdef USE_PAM | ||
1232 | +static int ssh_gssapi_simple_conv(int n, const struct pam_message **msg, | ||
1233 | + struct pam_response **resp, void *data) | ||
1234 | { | ||
1235 | - ctx->major = gss_verify_mic(&ctx->minor, ctx->context, | ||
1236 | - gssbuf, gssmic, NULL); | ||
1237 | + return (PAM_CONV_ERR); | ||
1238 | +} | ||
1239 | +#endif | ||
1240 | |||
1241 | - return (ctx->major); | ||
1242 | +void | ||
1243 | +ssh_gssapi_rekey_creds() { | ||
1244 | + int ok; | ||
1245 | + int ret; | ||
1246 | +#ifdef USE_PAM | ||
1247 | + pam_handle_t *pamh = NULL; | ||
1248 | + struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL}; | ||
1249 | + char *envstr; | ||
1250 | +#endif | ||
1251 | + | ||
1252 | + if (gssapi_client.store.filename == NULL && | ||
1253 | + gssapi_client.store.envval == NULL && | ||
1254 | + gssapi_client.store.envvar == NULL) | ||
1255 | + return; | ||
1256 | + | ||
1257 | + ok = PRIVSEP(ssh_gssapi_update_creds(&gssapi_client.store)); | ||
1258 | + | ||
1259 | + if (!ok) | ||
1260 | + return; | ||
1261 | + | ||
1262 | + debug("Rekeyed credentials stored successfully"); | ||
1263 | + | ||
1264 | + /* Actually managing to play with the ssh pam stack from here will | ||
1265 | + * be next to impossible. In any case, we may want different options | ||
1266 | + * for rekeying. So, use our own :) | ||
1267 | + */ | ||
1268 | +#ifdef USE_PAM | ||
1269 | + if (!use_privsep) { | ||
1270 | + debug("Not even going to try and do PAM with privsep disabled"); | ||
1271 | + return; | ||
1272 | + } | ||
1273 | + | ||
1274 | + ret = pam_start("sshd-rekey", gssapi_client.store.owner->pw_name, | ||
1275 | + &pamconv, &pamh); | ||
1276 | + if (ret) | ||
1277 | + return; | ||
1278 | + | ||
1279 | + xasprintf(&envstr, "%s=%s", gssapi_client.store.envvar, | ||
1280 | + gssapi_client.store.envval); | ||
1281 | + | ||
1282 | + ret = pam_putenv(pamh, envstr); | ||
1283 | + if (!ret) | ||
1284 | + pam_setcred(pamh, PAM_REINITIALIZE_CRED); | ||
1285 | + pam_end(pamh, PAM_SUCCESS); | ||
1286 | +#endif | ||
1287 | +} | ||
1288 | + | ||
1289 | +int | ||
1290 | +ssh_gssapi_update_creds(ssh_gssapi_ccache *store) { | ||
1291 | + int ok = 0; | ||
1292 | + | ||
1293 | + /* Check we've got credentials to store */ | ||
1294 | + if (!gssapi_client.updated) | ||
1295 | + return 0; | ||
1296 | + | ||
1297 | + gssapi_client.updated = 0; | ||
1298 | + | ||
1299 | + temporarily_use_uid(gssapi_client.store.owner); | ||
1300 | + if (gssapi_client.mech && gssapi_client.mech->updatecreds) | ||
1301 | + ok = (*gssapi_client.mech->updatecreds)(store, &gssapi_client); | ||
1302 | + else | ||
1303 | + debug("No update function for this mechanism"); | ||
1304 | + | ||
1305 | + restore_uid(); | ||
1306 | + | ||
1307 | + return ok; | ||
1308 | } | ||
1309 | |||
1310 | #endif | ||
1311 | diff --git a/kex.c b/kex.c | ||
1312 | index 616484b..49d0fc8 100644 | ||
1313 | --- a/kex.c | ||
1314 | +++ b/kex.c | ||
1315 | @@ -51,6 +51,10 @@ | ||
1316 | #include "roaming.h" | ||
1317 | #include "digest.h" | ||
1318 | |||
1319 | +#ifdef GSSAPI | ||
1320 | +#include "ssh-gss.h" | ||
1321 | +#endif | ||
1322 | + | ||
1323 | #if OPENSSL_VERSION_NUMBER >= 0x00907000L | ||
1324 | # if defined(HAVE_EVP_SHA256) | ||
1325 | # define evp_ssh_sha256 EVP_sha256 | ||
1326 | @@ -92,6 +96,14 @@ static const struct kexalg kexalgs[] = { | ||
1327 | #endif | ||
1328 | { NULL, -1, -1, -1}, | ||
1329 | }; | ||
1330 | +static const struct kexalg kexalg_prefixes[] = { | ||
1331 | +#ifdef GSSAPI | ||
1332 | + { KEX_GSS_GEX_SHA1_ID, KEX_GSS_GEX_SHA1, 0, SSH_DIGEST_SHA1 }, | ||
1333 | + { KEX_GSS_GRP1_SHA1_ID, KEX_GSS_GRP1_SHA1, 0, SSH_DIGEST_SHA1 }, | ||
1334 | + { KEX_GSS_GRP14_SHA1_ID, KEX_GSS_GRP14_SHA1, 0, SSH_DIGEST_SHA1 }, | ||
1335 | +#endif | ||
1336 | + { NULL, -1, -1, -1 }, | ||
1337 | +}; | ||
1338 | |||
1339 | char * | ||
1340 | kex_alg_list(char sep) | ||
1341 | @@ -120,6 +132,10 @@ kex_alg_by_name(const char *name) | ||
1342 | if (strcmp(k->name, name) == 0) | ||
1343 | return k; | ||
1344 | } | ||
1345 | + for (k = kexalg_prefixes; k->name != NULL; k++) { | ||
1346 | + if (strncmp(k->name, name, strlen(k->name)) == 0) | ||
1347 | + return k; | ||
1348 | + } | ||
1349 | return NULL; | ||
1350 | } | ||
1351 | |||
1352 | diff --git a/kex.h b/kex.h | ||
1353 | index 1aa3ec2..8fbcb2b 100644 | ||
1354 | --- a/kex.h | ||
1355 | +++ b/kex.h | ||
1356 | @@ -76,6 +76,9 @@ enum kex_exchange { | ||
1357 | KEX_DH_GEX_SHA256, | ||
1358 | KEX_ECDH_SHA2, | ||
1359 | KEX_C25519_SHA256, | ||
1360 | + KEX_GSS_GRP1_SHA1, | ||
1361 | + KEX_GSS_GRP14_SHA1, | ||
1362 | + KEX_GSS_GEX_SHA1, | ||
1363 | KEX_MAX | ||
1364 | }; | ||
1365 | |||
1366 | @@ -136,6 +139,12 @@ struct Kex { | ||
1367 | int flags; | ||
1368 | int hash_alg; | ||
1369 | int ec_nid; | ||
1370 | +#ifdef GSSAPI | ||
1371 | + int gss_deleg_creds; | ||
1372 | + int gss_trust_dns; | ||
1373 | + char *gss_host; | ||
1374 | + char *gss_client; | ||
1375 | +#endif | ||
1376 | char *client_version_string; | ||
1377 | char *server_version_string; | ||
1378 | int (*verify_host_key)(Key *); | ||
1379 | @@ -168,6 +177,11 @@ void kexecdh_server(Kex *); | ||
1380 | void kexc25519_client(Kex *); | ||
1381 | void kexc25519_server(Kex *); | ||
1382 | |||
1383 | +#ifdef GSSAPI | ||
1384 | +void kexgss_client(Kex *); | ||
1385 | +void kexgss_server(Kex *); | ||
1386 | +#endif | ||
1387 | + | ||
1388 | void | ||
1389 | kex_dh_hash(char *, char *, char *, int, char *, int, u_char *, int, | ||
1390 | BIGNUM *, BIGNUM *, BIGNUM *, u_char **, u_int *); | ||
1391 | diff --git a/kexgssc.c b/kexgssc.c | ||
1392 | new file mode 100644 | ||
1393 | index 0000000..14f5598 | ||
1394 | --- /dev/null | ||
1395 | +++ b/kexgssc.c | ||
1396 | @@ -0,0 +1,333 @@ | ||
1397 | +/* | ||
1398 | + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. | ||
1399 | + * | ||
1400 | + * Redistribution and use in source and binary forms, with or without | ||
1401 | + * modification, are permitted provided that the following conditions | ||
1402 | + * are met: | ||
1403 | + * 1. Redistributions of source code must retain the above copyright | ||
1404 | + * notice, this list of conditions and the following disclaimer. | ||
1405 | + * 2. Redistributions in binary form must reproduce the above copyright | ||
1406 | + * notice, this list of conditions and the following disclaimer in the | ||
1407 | + * documentation and/or other materials provided with the distribution. | ||
1408 | + * | ||
1409 | + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR | ||
1410 | + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
1411 | + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
1412 | + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
1413 | + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
1414 | + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
1415 | + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
1416 | + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
1417 | + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
1418 | + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
1419 | + */ | ||
1420 | + | ||
1421 | +#include "includes.h" | ||
1422 | + | ||
1423 | +#ifdef GSSAPI | ||
1424 | + | ||
1425 | +#include "includes.h" | ||
1426 | + | ||
1427 | +#include <openssl/crypto.h> | ||
1428 | +#include <openssl/bn.h> | ||
1429 | + | ||
1430 | +#include <string.h> | ||
1431 | + | ||
1432 | +#include "xmalloc.h" | ||
1433 | +#include "buffer.h" | ||
1434 | +#include "ssh2.h" | ||
1435 | +#include "key.h" | ||
1436 | +#include "cipher.h" | ||
1437 | +#include "kex.h" | ||
1438 | +#include "log.h" | ||
1439 | +#include "packet.h" | ||
1440 | +#include "dh.h" | ||
1441 | + | ||
1442 | +#include "ssh-gss.h" | ||
1443 | + | ||
1444 | +void | ||
1445 | +kexgss_client(Kex *kex) { | ||
1446 | + gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; | ||
1447 | + gss_buffer_desc recv_tok, gssbuf, msg_tok, *token_ptr; | ||
1448 | + Gssctxt *ctxt; | ||
1449 | + OM_uint32 maj_status, min_status, ret_flags; | ||
1450 | + u_int klen, kout, slen = 0, hashlen, strlen; | ||
1451 | + DH *dh; | ||
1452 | + BIGNUM *dh_server_pub = NULL; | ||
1453 | + BIGNUM *shared_secret = NULL; | ||
1454 | + BIGNUM *p = NULL; | ||
1455 | + BIGNUM *g = NULL; | ||
1456 | + u_char *kbuf, *hash; | ||
1457 | + u_char *serverhostkey = NULL; | ||
1458 | + u_char *empty = ""; | ||
1459 | + char *msg; | ||
1460 | + char *lang; | ||
1461 | + int type = 0; | ||
1462 | + int first = 1; | ||
1463 | + int nbits = 0, min = DH_GRP_MIN, max = DH_GRP_MAX; | ||
1464 | + | ||
1465 | + /* Initialise our GSSAPI world */ | ||
1466 | + ssh_gssapi_build_ctx(&ctxt); | ||
1467 | + if (ssh_gssapi_id_kex(ctxt, kex->name, kex->kex_type) | ||
1468 | + == GSS_C_NO_OID) | ||
1469 | + fatal("Couldn't identify host exchange"); | ||
1470 | + | ||
1471 | + if (ssh_gssapi_import_name(ctxt, kex->gss_host)) | ||
1472 | + fatal("Couldn't import hostname"); | ||
1473 | + | ||
1474 | + if (kex->gss_client && | ||
1475 | + ssh_gssapi_client_identity(ctxt, kex->gss_client)) | ||
1476 | + fatal("Couldn't acquire client credentials"); | ||
1477 | + | ||
1478 | + switch (kex->kex_type) { | ||
1479 | + case KEX_GSS_GRP1_SHA1: | ||
1480 | + dh = dh_new_group1(); | ||
1481 | + break; | ||
1482 | + case KEX_GSS_GRP14_SHA1: | ||
1483 | + dh = dh_new_group14(); | ||
1484 | + break; | ||
1485 | + case KEX_GSS_GEX_SHA1: | ||
1486 | + debug("Doing group exchange\n"); | ||
1487 | + nbits = dh_estimate(kex->we_need * 8); | ||
1488 | + packet_start(SSH2_MSG_KEXGSS_GROUPREQ); | ||
1489 | + packet_put_int(min); | ||
1490 | + packet_put_int(nbits); | ||
1491 | + packet_put_int(max); | ||
1492 | + | ||
1493 | + packet_send(); | ||
1494 | + | ||
1495 | + packet_read_expect(SSH2_MSG_KEXGSS_GROUP); | ||
1496 | + | ||
1497 | + if ((p = BN_new()) == NULL) | ||
1498 | + fatal("BN_new() failed"); | ||
1499 | + packet_get_bignum2(p); | ||
1500 | + if ((g = BN_new()) == NULL) | ||
1501 | + fatal("BN_new() failed"); | ||
1502 | + packet_get_bignum2(g); | ||
1503 | + packet_check_eom(); | ||
1504 | + | ||
1505 | + if (BN_num_bits(p) < min || BN_num_bits(p) > max) | ||
1506 | + fatal("GSSGRP_GEX group out of range: %d !< %d !< %d", | ||
1507 | + min, BN_num_bits(p), max); | ||
1508 | + | ||
1509 | + dh = dh_new_group(g, p); | ||
1510 | + break; | ||
1511 | + default: | ||
1512 | + fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); | ||
1513 | + } | ||
1514 | + | ||
1515 | + /* Step 1 - e is dh->pub_key */ | ||
1516 | + dh_gen_key(dh, kex->we_need * 8); | ||
1517 | + | ||
1518 | + /* This is f, we initialise it now to make life easier */ | ||
1519 | + dh_server_pub = BN_new(); | ||
1520 | + if (dh_server_pub == NULL) | ||
1521 | + fatal("dh_server_pub == NULL"); | ||
1522 | + | ||
1523 | + token_ptr = GSS_C_NO_BUFFER; | ||
1524 | + | ||
1525 | + do { | ||
1526 | + debug("Calling gss_init_sec_context"); | ||
1527 | + | ||
1528 | + maj_status = ssh_gssapi_init_ctx(ctxt, | ||
1529 | + kex->gss_deleg_creds, token_ptr, &send_tok, | ||
1530 | + &ret_flags); | ||
1531 | + | ||
1532 | + if (GSS_ERROR(maj_status)) { | ||
1533 | + if (send_tok.length != 0) { | ||
1534 | + packet_start(SSH2_MSG_KEXGSS_CONTINUE); | ||
1535 | + packet_put_string(send_tok.value, | ||
1536 | + send_tok.length); | ||
1537 | + } | ||
1538 | + fatal("gss_init_context failed"); | ||
1539 | + } | ||
1540 | + | ||
1541 | + /* If we've got an old receive buffer get rid of it */ | ||
1542 | + if (token_ptr != GSS_C_NO_BUFFER) | ||
1543 | + free(recv_tok.value); | ||
1544 | + | ||
1545 | + if (maj_status == GSS_S_COMPLETE) { | ||
1546 | + /* If mutual state flag is not true, kex fails */ | ||
1547 | + if (!(ret_flags & GSS_C_MUTUAL_FLAG)) | ||
1548 | + fatal("Mutual authentication failed"); | ||
1549 | + | ||
1550 | + /* If integ avail flag is not true kex fails */ | ||
1551 | + if (!(ret_flags & GSS_C_INTEG_FLAG)) | ||
1552 | + fatal("Integrity check failed"); | ||
1553 | + } | ||
1554 | + | ||
1555 | + /* | ||
1556 | + * If we have data to send, then the last message that we | ||
1557 | + * received cannot have been a 'complete'. | ||
1558 | + */ | ||
1559 | + if (send_tok.length != 0) { | ||
1560 | + if (first) { | ||
1561 | + packet_start(SSH2_MSG_KEXGSS_INIT); | ||
1562 | + packet_put_string(send_tok.value, | ||
1563 | + send_tok.length); | ||
1564 | + packet_put_bignum2(dh->pub_key); | ||
1565 | + first = 0; | ||
1566 | + } else { | ||
1567 | + packet_start(SSH2_MSG_KEXGSS_CONTINUE); | ||
1568 | + packet_put_string(send_tok.value, | ||
1569 | + send_tok.length); | ||
1570 | + } | ||
1571 | + packet_send(); | ||
1572 | + gss_release_buffer(&min_status, &send_tok); | ||
1573 | + | ||
1574 | + /* If we've sent them data, they should reply */ | ||
1575 | + do { | ||
1576 | + type = packet_read(); | ||
1577 | + if (type == SSH2_MSG_KEXGSS_HOSTKEY) { | ||
1578 | + debug("Received KEXGSS_HOSTKEY"); | ||
1579 | + if (serverhostkey) | ||
1580 | + fatal("Server host key received more than once"); | ||
1581 | + serverhostkey = | ||
1582 | + packet_get_string(&slen); | ||
1583 | + } | ||
1584 | + } while (type == SSH2_MSG_KEXGSS_HOSTKEY); | ||
1585 | + | ||
1586 | + switch (type) { | ||
1587 | + case SSH2_MSG_KEXGSS_CONTINUE: | ||
1588 | + debug("Received GSSAPI_CONTINUE"); | ||
1589 | + if (maj_status == GSS_S_COMPLETE) | ||
1590 | + fatal("GSSAPI Continue received from server when complete"); | ||
1591 | + recv_tok.value = packet_get_string(&strlen); | ||
1592 | + recv_tok.length = strlen; | ||
1593 | + break; | ||
1594 | + case SSH2_MSG_KEXGSS_COMPLETE: | ||
1595 | + debug("Received GSSAPI_COMPLETE"); | ||
1596 | + packet_get_bignum2(dh_server_pub); | ||
1597 | + msg_tok.value = packet_get_string(&strlen); | ||
1598 | + msg_tok.length = strlen; | ||
1599 | + | ||
1600 | + /* Is there a token included? */ | ||
1601 | + if (packet_get_char()) { | ||
1602 | + recv_tok.value= | ||
1603 | + packet_get_string(&strlen); | ||
1604 | + recv_tok.length = strlen; | ||
1605 | + /* If we're already complete - protocol error */ | ||
1606 | + if (maj_status == GSS_S_COMPLETE) | ||
1607 | + packet_disconnect("Protocol error: received token when complete"); | ||
1608 | + } else { | ||
1609 | + /* No token included */ | ||
1610 | + if (maj_status != GSS_S_COMPLETE) | ||
1611 | + packet_disconnect("Protocol error: did not receive final token"); | ||
1612 | + } | ||
1613 | + break; | ||
1614 | + case SSH2_MSG_KEXGSS_ERROR: | ||
1615 | + debug("Received Error"); | ||
1616 | + maj_status = packet_get_int(); | ||
1617 | + min_status = packet_get_int(); | ||
1618 | + msg = packet_get_string(NULL); | ||
1619 | + lang = packet_get_string(NULL); | ||
1620 | + fatal("GSSAPI Error: \n%.400s",msg); | ||
1621 | + default: | ||
1622 | + packet_disconnect("Protocol error: didn't expect packet type %d", | ||
1623 | + type); | ||
1624 | + } | ||
1625 | + token_ptr = &recv_tok; | ||
1626 | + } else { | ||
1627 | + /* No data, and not complete */ | ||
1628 | + if (maj_status != GSS_S_COMPLETE) | ||
1629 | + fatal("Not complete, and no token output"); | ||
1630 | + } | ||
1631 | + } while (maj_status & GSS_S_CONTINUE_NEEDED); | ||
1632 | + | ||
1633 | + /* | ||
1634 | + * We _must_ have received a COMPLETE message in reply from the | ||
1635 | + * server, which will have set dh_server_pub and msg_tok | ||
1636 | + */ | ||
1637 | + | ||
1638 | + if (type != SSH2_MSG_KEXGSS_COMPLETE) | ||
1639 | + fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); | ||
1640 | + | ||
1641 | + /* Check f in range [1, p-1] */ | ||
1642 | + if (!dh_pub_is_valid(dh, dh_server_pub)) | ||
1643 | + packet_disconnect("bad server public DH value"); | ||
1644 | + | ||
1645 | + /* compute K=f^x mod p */ | ||
1646 | + klen = DH_size(dh); | ||
1647 | + kbuf = xmalloc(klen); | ||
1648 | + kout = DH_compute_key(kbuf, dh_server_pub, dh); | ||
1649 | + if (kout < 0) | ||
1650 | + fatal("DH_compute_key: failed"); | ||
1651 | + | ||
1652 | + shared_secret = BN_new(); | ||
1653 | + if (shared_secret == NULL) | ||
1654 | + fatal("kexgss_client: BN_new failed"); | ||
1655 | + | ||
1656 | + if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) | ||
1657 | + fatal("kexdh_client: BN_bin2bn failed"); | ||
1658 | + | ||
1659 | + memset(kbuf, 0, klen); | ||
1660 | + free(kbuf); | ||
1661 | + | ||
1662 | + switch (kex->kex_type) { | ||
1663 | + case KEX_GSS_GRP1_SHA1: | ||
1664 | + case KEX_GSS_GRP14_SHA1: | ||
1665 | + kex_dh_hash( kex->client_version_string, | ||
1666 | + kex->server_version_string, | ||
1667 | + buffer_ptr(&kex->my), buffer_len(&kex->my), | ||
1668 | + buffer_ptr(&kex->peer), buffer_len(&kex->peer), | ||
1669 | + (serverhostkey ? serverhostkey : empty), slen, | ||
1670 | + dh->pub_key, /* e */ | ||
1671 | + dh_server_pub, /* f */ | ||
1672 | + shared_secret, /* K */ | ||
1673 | + &hash, &hashlen | ||
1674 | + ); | ||
1675 | + break; | ||
1676 | + case KEX_GSS_GEX_SHA1: | ||
1677 | + kexgex_hash( | ||
1678 | + kex->hash_alg, | ||
1679 | + kex->client_version_string, | ||
1680 | + kex->server_version_string, | ||
1681 | + buffer_ptr(&kex->my), buffer_len(&kex->my), | ||
1682 | + buffer_ptr(&kex->peer), buffer_len(&kex->peer), | ||
1683 | + (serverhostkey ? serverhostkey : empty), slen, | ||
1684 | + min, nbits, max, | ||
1685 | + dh->p, dh->g, | ||
1686 | + dh->pub_key, | ||
1687 | + dh_server_pub, | ||
1688 | + shared_secret, | ||
1689 | + &hash, &hashlen | ||
1690 | + ); | ||
1691 | + break; | ||
1692 | + default: | ||
1693 | + fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); | ||
1694 | + } | ||
1695 | + | ||
1696 | + gssbuf.value = hash; | ||
1697 | + gssbuf.length = hashlen; | ||
1698 | + | ||
1699 | + /* Verify that the hash matches the MIC we just got. */ | ||
1700 | + if (GSS_ERROR(ssh_gssapi_checkmic(ctxt, &gssbuf, &msg_tok))) | ||
1701 | + packet_disconnect("Hash's MIC didn't verify"); | ||
1702 | + | ||
1703 | + free(msg_tok.value); | ||
1704 | + | ||
1705 | + DH_free(dh); | ||
1706 | + free(serverhostkey); | ||
1707 | + BN_clear_free(dh_server_pub); | ||
1708 | + | ||
1709 | + /* save session id */ | ||
1710 | + if (kex->session_id == NULL) { | ||
1711 | + kex->session_id_len = hashlen; | ||
1712 | + kex->session_id = xmalloc(kex->session_id_len); | ||
1713 | + memcpy(kex->session_id, hash, kex->session_id_len); | ||
1714 | + } | ||
1715 | + | ||
1716 | + if (kex->gss_deleg_creds) | ||
1717 | + ssh_gssapi_credentials_updated(ctxt); | ||
1718 | + | ||
1719 | + if (gss_kex_context == NULL) | ||
1720 | + gss_kex_context = ctxt; | ||
1721 | + else | ||
1722 | + ssh_gssapi_delete_ctx(&ctxt); | ||
1723 | + | ||
1724 | + kex_derive_keys_bn(kex, hash, hashlen, shared_secret); | ||
1725 | + BN_clear_free(shared_secret); | ||
1726 | + kex_finish(kex); | ||
1727 | +} | ||
1728 | + | ||
1729 | +#endif /* GSSAPI */ | ||
1730 | diff --git a/kexgsss.c b/kexgsss.c | ||
1731 | new file mode 100644 | ||
1732 | index 0000000..8095259 | ||
1733 | --- /dev/null | ||
1734 | +++ b/kexgsss.c | ||
1735 | @@ -0,0 +1,289 @@ | ||
1736 | +/* | ||
1737 | + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. | ||
1738 | + * | ||
1739 | + * Redistribution and use in source and binary forms, with or without | ||
1740 | + * modification, are permitted provided that the following conditions | ||
1741 | + * are met: | ||
1742 | + * 1. Redistributions of source code must retain the above copyright | ||
1743 | + * notice, this list of conditions and the following disclaimer. | ||
1744 | + * 2. Redistributions in binary form must reproduce the above copyright | ||
1745 | + * notice, this list of conditions and the following disclaimer in the | ||
1746 | + * documentation and/or other materials provided with the distribution. | ||
1747 | + * | ||
1748 | + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR | ||
1749 | + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
1750 | + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
1751 | + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
1752 | + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
1753 | + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
1754 | + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
1755 | + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
1756 | + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
1757 | + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
1758 | + */ | ||
1759 | + | ||
1760 | +#include "includes.h" | ||
1761 | + | ||
1762 | +#ifdef GSSAPI | ||
1763 | + | ||
1764 | +#include <string.h> | ||
1765 | + | ||
1766 | +#include <openssl/crypto.h> | ||
1767 | +#include <openssl/bn.h> | ||
1768 | + | ||
1769 | +#include "xmalloc.h" | ||
1770 | +#include "buffer.h" | ||
1771 | +#include "ssh2.h" | ||
1772 | +#include "key.h" | ||
1773 | +#include "cipher.h" | ||
1774 | +#include "kex.h" | ||
1775 | +#include "log.h" | ||
1776 | +#include "packet.h" | ||
1777 | +#include "dh.h" | ||
1778 | +#include "ssh-gss.h" | ||
1779 | +#include "monitor_wrap.h" | ||
1780 | +#include "servconf.h" | ||
1781 | + | ||
1782 | +extern ServerOptions options; | ||
1783 | + | ||
1784 | +void | ||
1785 | +kexgss_server(Kex *kex) | ||
1786 | +{ | ||
1787 | + OM_uint32 maj_status, min_status; | ||
1788 | + | ||
1789 | + /* | ||
1790 | + * Some GSSAPI implementations use the input value of ret_flags (an | ||
1791 | + * output variable) as a means of triggering mechanism specific | ||
1792 | + * features. Initializing it to zero avoids inadvertently | ||
1793 | + * activating this non-standard behaviour. | ||
1794 | + */ | ||
1795 | + | ||
1796 | + OM_uint32 ret_flags = 0; | ||
1797 | + gss_buffer_desc gssbuf, recv_tok, msg_tok; | ||
1798 | + gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; | ||
1799 | + Gssctxt *ctxt = NULL; | ||
1800 | + u_int slen, klen, kout, hashlen; | ||
1801 | + u_char *kbuf, *hash; | ||
1802 | + DH *dh; | ||
1803 | + int min = -1, max = -1, nbits = -1; | ||
1804 | + BIGNUM *shared_secret = NULL; | ||
1805 | + BIGNUM *dh_client_pub = NULL; | ||
1806 | + int type = 0; | ||
1807 | + gss_OID oid; | ||
1808 | + char *mechs; | ||
1809 | + | ||
1810 | + /* Initialise GSSAPI */ | ||
1811 | + | ||
1812 | + /* If we're rekeying, privsep means that some of the private structures | ||
1813 | + * in the GSSAPI code are no longer available. This kludges them back | ||
1814 | + * into life | ||
1815 | + */ | ||
1816 | + if (!ssh_gssapi_oid_table_ok()) { | ||
1817 | + mechs = ssh_gssapi_server_mechanisms(); | ||
1818 | + free(mechs); | ||
1819 | + } | ||
1820 | + | ||
1821 | + debug2("%s: Identifying %s", __func__, kex->name); | ||
1822 | + oid = ssh_gssapi_id_kex(NULL, kex->name, kex->kex_type); | ||
1823 | + if (oid == GSS_C_NO_OID) | ||
1824 | + fatal("Unknown gssapi mechanism"); | ||
1825 | + | ||
1826 | + debug2("%s: Acquiring credentials", __func__); | ||
1827 | + | ||
1828 | + if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, oid)))) | ||
1829 | + fatal("Unable to acquire credentials for the server"); | ||
1830 | + | ||
1831 | + switch (kex->kex_type) { | ||
1832 | + case KEX_GSS_GRP1_SHA1: | ||
1833 | + dh = dh_new_group1(); | ||
1834 | + break; | ||
1835 | + case KEX_GSS_GRP14_SHA1: | ||
1836 | + dh = dh_new_group14(); | ||
1837 | + break; | ||
1838 | + case KEX_GSS_GEX_SHA1: | ||
1839 | + debug("Doing group exchange"); | ||
1840 | + packet_read_expect(SSH2_MSG_KEXGSS_GROUPREQ); | ||
1841 | + min = packet_get_int(); | ||
1842 | + nbits = packet_get_int(); | ||
1843 | + max = packet_get_int(); | ||
1844 | + min = MAX(DH_GRP_MIN, min); | ||
1845 | + max = MIN(DH_GRP_MAX, max); | ||
1846 | + packet_check_eom(); | ||
1847 | + if (max < min || nbits < min || max < nbits) | ||
1848 | + fatal("GSS_GEX, bad parameters: %d !< %d !< %d", | ||
1849 | + min, nbits, max); | ||
1850 | + dh = PRIVSEP(choose_dh(min, nbits, max)); | ||
1851 | + if (dh == NULL) | ||
1852 | + packet_disconnect("Protocol error: no matching group found"); | ||
1853 | + | ||
1854 | + packet_start(SSH2_MSG_KEXGSS_GROUP); | ||
1855 | + packet_put_bignum2(dh->p); | ||
1856 | + packet_put_bignum2(dh->g); | ||
1857 | + packet_send(); | ||
1858 | + | ||
1859 | + packet_write_wait(); | ||
1860 | + break; | ||
1861 | + default: | ||
1862 | + fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); | ||
1863 | + } | ||
1864 | + | ||
1865 | + dh_gen_key(dh, kex->we_need * 8); | ||
1866 | + | ||
1867 | + do { | ||
1868 | + debug("Wait SSH2_MSG_GSSAPI_INIT"); | ||
1869 | + type = packet_read(); | ||
1870 | + switch(type) { | ||
1871 | + case SSH2_MSG_KEXGSS_INIT: | ||
1872 | + if (dh_client_pub != NULL) | ||
1873 | + fatal("Received KEXGSS_INIT after initialising"); | ||
1874 | + recv_tok.value = packet_get_string(&slen); | ||
1875 | + recv_tok.length = slen; | ||
1876 | + | ||
1877 | + if ((dh_client_pub = BN_new()) == NULL) | ||
1878 | + fatal("dh_client_pub == NULL"); | ||
1879 | + | ||
1880 | + packet_get_bignum2(dh_client_pub); | ||
1881 | + | ||
1882 | + /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ | ||
1883 | + break; | ||
1884 | + case SSH2_MSG_KEXGSS_CONTINUE: | ||
1885 | + recv_tok.value = packet_get_string(&slen); | ||
1886 | + recv_tok.length = slen; | ||
1887 | + break; | ||
1888 | + default: | ||
1889 | + packet_disconnect( | ||
1890 | + "Protocol error: didn't expect packet type %d", | ||
1891 | + type); | ||
1892 | + } | ||
1893 | + | ||
1894 | + maj_status = PRIVSEP(ssh_gssapi_accept_ctx(ctxt, &recv_tok, | ||
1895 | + &send_tok, &ret_flags)); | ||
1896 | + | ||
1897 | + free(recv_tok.value); | ||
1898 | + | ||
1899 | + if (maj_status != GSS_S_COMPLETE && send_tok.length == 0) | ||
1900 | + fatal("Zero length token output when incomplete"); | ||
1901 | + | ||
1902 | + if (dh_client_pub == NULL) | ||
1903 | + fatal("No client public key"); | ||
1904 | + | ||
1905 | + if (maj_status & GSS_S_CONTINUE_NEEDED) { | ||
1906 | + debug("Sending GSSAPI_CONTINUE"); | ||
1907 | + packet_start(SSH2_MSG_KEXGSS_CONTINUE); | ||
1908 | + packet_put_string(send_tok.value, send_tok.length); | ||
1909 | + packet_send(); | ||
1910 | + gss_release_buffer(&min_status, &send_tok); | ||
1911 | + } | ||
1912 | + } while (maj_status & GSS_S_CONTINUE_NEEDED); | ||
1913 | + | ||
1914 | + if (GSS_ERROR(maj_status)) { | ||
1915 | + if (send_tok.length > 0) { | ||
1916 | + packet_start(SSH2_MSG_KEXGSS_CONTINUE); | ||
1917 | + packet_put_string(send_tok.value, send_tok.length); | ||
1918 | + packet_send(); | ||
1919 | + } | ||
1920 | + fatal("accept_ctx died"); | ||
1921 | + } | ||
1922 | + | ||
1923 | + if (!(ret_flags & GSS_C_MUTUAL_FLAG)) | ||
1924 | + fatal("Mutual Authentication flag wasn't set"); | ||
1925 | + | ||
1926 | + if (!(ret_flags & GSS_C_INTEG_FLAG)) | ||
1927 | + fatal("Integrity flag wasn't set"); | ||
1928 | + | ||
1929 | + if (!dh_pub_is_valid(dh, dh_client_pub)) | ||
1930 | + packet_disconnect("bad client public DH value"); | ||
1931 | + | ||
1932 | + klen = DH_size(dh); | ||
1933 | + kbuf = xmalloc(klen); | ||
1934 | + kout = DH_compute_key(kbuf, dh_client_pub, dh); | ||
1935 | + if (kout < 0) | ||
1936 | + fatal("DH_compute_key: failed"); | ||
1937 | + | ||
1938 | + shared_secret = BN_new(); | ||
1939 | + if (shared_secret == NULL) | ||
1940 | + fatal("kexgss_server: BN_new failed"); | ||
1941 | + | ||
1942 | + if (BN_bin2bn(kbuf, kout, shared_secret) == NULL) | ||
1943 | + fatal("kexgss_server: BN_bin2bn failed"); | ||
1944 | + | ||
1945 | + memset(kbuf, 0, klen); | ||
1946 | + free(kbuf); | ||
1947 | + | ||
1948 | + switch (kex->kex_type) { | ||
1949 | + case KEX_GSS_GRP1_SHA1: | ||
1950 | + case KEX_GSS_GRP14_SHA1: | ||
1951 | + kex_dh_hash( | ||
1952 | + kex->client_version_string, kex->server_version_string, | ||
1953 | + buffer_ptr(&kex->peer), buffer_len(&kex->peer), | ||
1954 | + buffer_ptr(&kex->my), buffer_len(&kex->my), | ||
1955 | + NULL, 0, /* Change this if we start sending host keys */ | ||
1956 | + dh_client_pub, dh->pub_key, shared_secret, | ||
1957 | + &hash, &hashlen | ||
1958 | + ); | ||
1959 | + break; | ||
1960 | + case KEX_GSS_GEX_SHA1: | ||
1961 | + kexgex_hash( | ||
1962 | + kex->hash_alg, | ||
1963 | + kex->client_version_string, kex->server_version_string, | ||
1964 | + buffer_ptr(&kex->peer), buffer_len(&kex->peer), | ||
1965 | + buffer_ptr(&kex->my), buffer_len(&kex->my), | ||
1966 | + NULL, 0, | ||
1967 | + min, nbits, max, | ||
1968 | + dh->p, dh->g, | ||
1969 | + dh_client_pub, | ||
1970 | + dh->pub_key, | ||
1971 | + shared_secret, | ||
1972 | + &hash, &hashlen | ||
1973 | + ); | ||
1974 | + break; | ||
1975 | + default: | ||
1976 | + fatal("%s: Unexpected KEX type %d", __func__, kex->kex_type); | ||
1977 | + } | ||
1978 | + | ||
1979 | + BN_clear_free(dh_client_pub); | ||
1980 | + | ||
1981 | + if (kex->session_id == NULL) { | ||
1982 | + kex->session_id_len = hashlen; | ||
1983 | + kex->session_id = xmalloc(kex->session_id_len); | ||
1984 | + memcpy(kex->session_id, hash, kex->session_id_len); | ||
1985 | + } | ||
1986 | + | ||
1987 | + gssbuf.value = hash; | ||
1988 | + gssbuf.length = hashlen; | ||
1989 | + | ||
1990 | + if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) | ||
1991 | + fatal("Couldn't get MIC"); | ||
1992 | + | ||
1993 | + packet_start(SSH2_MSG_KEXGSS_COMPLETE); | ||
1994 | + packet_put_bignum2(dh->pub_key); | ||
1995 | + packet_put_string(msg_tok.value,msg_tok.length); | ||
1996 | + | ||
1997 | + if (send_tok.length != 0) { | ||
1998 | + packet_put_char(1); /* true */ | ||
1999 | + packet_put_string(send_tok.value, send_tok.length); | ||
2000 | + } else { | ||
2001 | + packet_put_char(0); /* false */ | ||
2002 | + } | ||
2003 | + packet_send(); | ||
2004 | + | ||
2005 | + gss_release_buffer(&min_status, &send_tok); | ||
2006 | + gss_release_buffer(&min_status, &msg_tok); | ||
2007 | + | ||
2008 | + if (gss_kex_context == NULL) | ||
2009 | + gss_kex_context = ctxt; | ||
2010 | + else | ||
2011 | + ssh_gssapi_delete_ctx(&ctxt); | ||
2012 | + | ||
2013 | + DH_free(dh); | ||
2014 | + | ||
2015 | + kex_derive_keys_bn(kex, hash, hashlen, shared_secret); | ||
2016 | + BN_clear_free(shared_secret); | ||
2017 | + kex_finish(kex); | ||
2018 | + | ||
2019 | + /* If this was a rekey, then save out any delegated credentials we | ||
2020 | + * just exchanged. */ | ||
2021 | + if (options.gss_store_rekey) | ||
2022 | + ssh_gssapi_rekey_creds(); | ||
2023 | +} | ||
2024 | +#endif /* GSSAPI */ | ||
2025 | diff --git a/key.c b/key.c | ||
2026 | index 9142338..3867eb3 100644 | ||
2027 | --- a/key.c | ||
2028 | +++ b/key.c | ||
2029 | @@ -985,6 +985,7 @@ static const struct keytype keytypes[] = { | ||
2030 | KEY_DSA_CERT_V00, 0, 1 }, | ||
2031 | { "ssh-ed25519-cert-v01@openssh.com", "ED25519-CERT", | ||
2032 | KEY_ED25519_CERT, 0, 1 }, | ||
2033 | + { "null", "null", KEY_NULL, 0, 0 }, | ||
2034 | { NULL, NULL, -1, -1, 0 } | ||
2035 | }; | ||
2036 | |||
2037 | diff --git a/key.h b/key.h | ||
2038 | index d8ad13d..c8aeba2 100644 | ||
2039 | --- a/key.h | ||
2040 | +++ b/key.h | ||
2041 | @@ -46,6 +46,7 @@ enum types { | ||
2042 | KEY_ED25519_CERT, | ||
2043 | KEY_RSA_CERT_V00, | ||
2044 | KEY_DSA_CERT_V00, | ||
2045 | + KEY_NULL, | ||
2046 | KEY_UNSPEC | ||
2047 | }; | ||
2048 | enum fp_type { | ||
2049 | diff --git a/monitor.c b/monitor.c | ||
2050 | index 03baf1e..a777c4c 100644 | ||
2051 | --- a/monitor.c | ||
2052 | +++ b/monitor.c | ||
2053 | @@ -181,6 +181,8 @@ int mm_answer_gss_setup_ctx(int, Buffer *); | ||
2054 | int mm_answer_gss_accept_ctx(int, Buffer *); | ||
2055 | int mm_answer_gss_userok(int, Buffer *); | ||
2056 | int mm_answer_gss_checkmic(int, Buffer *); | ||
2057 | +int mm_answer_gss_sign(int, Buffer *); | ||
2058 | +int mm_answer_gss_updatecreds(int, Buffer *); | ||
2059 | #endif | ||
2060 | |||
2061 | #ifdef SSH_AUDIT_EVENTS | ||
2062 | @@ -253,6 +255,7 @@ struct mon_table mon_dispatch_proto20[] = { | ||
2063 | {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, | ||
2064 | {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, | ||
2065 | {MONITOR_REQ_GSSCHECKMIC, MON_ISAUTH, mm_answer_gss_checkmic}, | ||
2066 | + {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, | ||
2067 | #endif | ||
2068 | #ifdef JPAKE | ||
2069 | {MONITOR_REQ_JPAKE_GET_PWDATA, MON_ONCE, mm_answer_jpake_get_pwdata}, | ||
2070 | @@ -265,6 +268,12 @@ struct mon_table mon_dispatch_proto20[] = { | ||
2071 | }; | ||
2072 | |||
2073 | struct mon_table mon_dispatch_postauth20[] = { | ||
2074 | +#ifdef GSSAPI | ||
2075 | + {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, | ||
2076 | + {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, | ||
2077 | + {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, | ||
2078 | + {MONITOR_REQ_GSSUPCREDS, 0, mm_answer_gss_updatecreds}, | ||
2079 | +#endif | ||
2080 | {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, | ||
2081 | {MONITOR_REQ_SIGN, 0, mm_answer_sign}, | ||
2082 | {MONITOR_REQ_PTY, 0, mm_answer_pty}, | ||
2083 | @@ -373,6 +382,10 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor) | ||
2084 | /* Permit requests for moduli and signatures */ | ||
2085 | monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); | ||
2086 | monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); | ||
2087 | +#ifdef GSSAPI | ||
2088 | + /* and for the GSSAPI key exchange */ | ||
2089 | + monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); | ||
2090 | +#endif | ||
2091 | } else { | ||
2092 | mon_dispatch = mon_dispatch_proto15; | ||
2093 | |||
2094 | @@ -487,6 +500,10 @@ monitor_child_postauth(struct monitor *pmonitor) | ||
2095 | monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); | ||
2096 | monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); | ||
2097 | monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); | ||
2098 | +#ifdef GSSAPI | ||
2099 | + /* and for the GSSAPI key exchange */ | ||
2100 | + monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); | ||
2101 | +#endif | ||
2102 | } else { | ||
2103 | mon_dispatch = mon_dispatch_postauth15; | ||
2104 | monitor_permit(mon_dispatch, MONITOR_REQ_TERM, 1); | ||
2105 | @@ -1856,6 +1873,13 @@ mm_get_kex(Buffer *m) | ||
2106 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; | ||
2107 | kex->kex[KEX_ECDH_SHA2] = kexecdh_server; | ||
2108 | kex->kex[KEX_C25519_SHA256] = kexc25519_server; | ||
2109 | +#ifdef GSSAPI | ||
2110 | + if (options.gss_keyex) { | ||
2111 | + kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; | ||
2112 | + kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; | ||
2113 | + kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; | ||
2114 | + } | ||
2115 | +#endif | ||
2116 | kex->server = 1; | ||
2117 | kex->hostkey_type = buffer_get_int(m); | ||
2118 | kex->kex_type = buffer_get_int(m); | ||
2119 | @@ -2063,6 +2087,9 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m) | ||
2120 | OM_uint32 major; | ||
2121 | u_int len; | ||
2122 | |||
2123 | + if (!options.gss_authentication && !options.gss_keyex) | ||
2124 | + fatal("In GSSAPI monitor when GSSAPI is disabled"); | ||
2125 | + | ||
2126 | goid.elements = buffer_get_string(m, &len); | ||
2127 | goid.length = len; | ||
2128 | |||
2129 | @@ -2090,6 +2117,9 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m) | ||
2130 | OM_uint32 flags = 0; /* GSI needs this */ | ||
2131 | u_int len; | ||
2132 | |||
2133 | + if (!options.gss_authentication && !options.gss_keyex) | ||
2134 | + fatal("In GSSAPI monitor when GSSAPI is disabled"); | ||
2135 | + | ||
2136 | in.value = buffer_get_string(m, &len); | ||
2137 | in.length = len; | ||
2138 | major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags); | ||
2139 | @@ -2107,6 +2137,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m) | ||
2140 | monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); | ||
2141 | monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); | ||
2142 | monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); | ||
2143 | + monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); | ||
2144 | } | ||
2145 | return (0); | ||
2146 | } | ||
2147 | @@ -2118,6 +2149,9 @@ mm_answer_gss_checkmic(int sock, Buffer *m) | ||
2148 | OM_uint32 ret; | ||
2149 | u_int len; | ||
2150 | |||
2151 | + if (!options.gss_authentication && !options.gss_keyex) | ||
2152 | + fatal("In GSSAPI monitor when GSSAPI is disabled"); | ||
2153 | + | ||
2154 | gssbuf.value = buffer_get_string(m, &len); | ||
2155 | gssbuf.length = len; | ||
2156 | mic.value = buffer_get_string(m, &len); | ||
2157 | @@ -2144,7 +2178,11 @@ mm_answer_gss_userok(int sock, Buffer *m) | ||
2158 | { | ||
2159 | int authenticated; | ||
2160 | |||
2161 | - authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user); | ||
2162 | + if (!options.gss_authentication && !options.gss_keyex) | ||
2163 | + fatal("In GSSAPI monitor when GSSAPI is disabled"); | ||
2164 | + | ||
2165 | + authenticated = authctxt->valid && | ||
2166 | + ssh_gssapi_userok(authctxt->user, authctxt->pw); | ||
2167 | |||
2168 | buffer_clear(m); | ||
2169 | buffer_put_int(m, authenticated); | ||
2170 | @@ -2157,6 +2195,74 @@ mm_answer_gss_userok(int sock, Buffer *m) | ||
2171 | /* Monitor loop will terminate if authenticated */ | ||
2172 | return (authenticated); | ||
2173 | } | ||
2174 | + | ||
2175 | +int | ||
2176 | +mm_answer_gss_sign(int socket, Buffer *m) | ||
2177 | +{ | ||
2178 | + gss_buffer_desc data; | ||
2179 | + gss_buffer_desc hash = GSS_C_EMPTY_BUFFER; | ||
2180 | + OM_uint32 major, minor; | ||
2181 | + u_int len; | ||
2182 | + | ||
2183 | + if (!options.gss_authentication && !options.gss_keyex) | ||
2184 | + fatal("In GSSAPI monitor when GSSAPI is disabled"); | ||
2185 | + | ||
2186 | + data.value = buffer_get_string(m, &len); | ||
2187 | + data.length = len; | ||
2188 | + if (data.length != 20) | ||
2189 | + fatal("%s: data length incorrect: %d", __func__, | ||
2190 | + (int) data.length); | ||
2191 | + | ||
2192 | + /* Save the session ID on the first time around */ | ||
2193 | + if (session_id2_len == 0) { | ||
2194 | + session_id2_len = data.length; | ||
2195 | + session_id2 = xmalloc(session_id2_len); | ||
2196 | + memcpy(session_id2, data.value, session_id2_len); | ||
2197 | + } | ||
2198 | + major = ssh_gssapi_sign(gsscontext, &data, &hash); | ||
2199 | + | ||
2200 | + free(data.value); | ||
2201 | + | ||
2202 | + buffer_clear(m); | ||
2203 | + buffer_put_int(m, major); | ||
2204 | + buffer_put_string(m, hash.value, hash.length); | ||
2205 | + | ||
2206 | + mm_request_send(socket, MONITOR_ANS_GSSSIGN, m); | ||
2207 | + | ||
2208 | + gss_release_buffer(&minor, &hash); | ||
2209 | + | ||
2210 | + /* Turn on getpwnam permissions */ | ||
2211 | + monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); | ||
2212 | + | ||
2213 | + /* And credential updating, for when rekeying */ | ||
2214 | + monitor_permit(mon_dispatch, MONITOR_REQ_GSSUPCREDS, 1); | ||
2215 | + | ||
2216 | + return (0); | ||
2217 | +} | ||
2218 | + | ||
2219 | +int | ||
2220 | +mm_answer_gss_updatecreds(int socket, Buffer *m) { | ||
2221 | + ssh_gssapi_ccache store; | ||
2222 | + int ok; | ||
2223 | + | ||
2224 | + store.filename = buffer_get_string(m, NULL); | ||
2225 | + store.envvar = buffer_get_string(m, NULL); | ||
2226 | + store.envval = buffer_get_string(m, NULL); | ||
2227 | + | ||
2228 | + ok = ssh_gssapi_update_creds(&store); | ||
2229 | + | ||
2230 | + free(store.filename); | ||
2231 | + free(store.envvar); | ||
2232 | + free(store.envval); | ||
2233 | + | ||
2234 | + buffer_clear(m); | ||
2235 | + buffer_put_int(m, ok); | ||
2236 | + | ||
2237 | + mm_request_send(socket, MONITOR_ANS_GSSUPCREDS, m); | ||
2238 | + | ||
2239 | + return(0); | ||
2240 | +} | ||
2241 | + | ||
2242 | #endif /* GSSAPI */ | ||
2243 | |||
2244 | #ifdef JPAKE | ||
2245 | diff --git a/monitor.h b/monitor.h | ||
2246 | index 2caa469..315ef99 100644 | ||
2247 | --- a/monitor.h | ||
2248 | +++ b/monitor.h | ||
2249 | @@ -70,6 +70,9 @@ enum monitor_reqtype { | ||
2250 | MONITOR_REQ_PAM_FREE_CTX = 110, MONITOR_ANS_PAM_FREE_CTX = 111, | ||
2251 | MONITOR_REQ_AUDIT_EVENT = 112, MONITOR_REQ_AUDIT_COMMAND = 113, | ||
2252 | |||
2253 | + MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151, | ||
2254 | + MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153, | ||
2255 | + | ||
2256 | }; | ||
2257 | |||
2258 | struct mm_master; | ||
2259 | diff --git a/monitor_wrap.c b/monitor_wrap.c | ||
2260 | index 4ce4696..44019f3 100644 | ||
2261 | --- a/monitor_wrap.c | ||
2262 | +++ b/monitor_wrap.c | ||
2263 | @@ -1273,7 +1273,7 @@ mm_ssh_gssapi_checkmic(Gssctxt *ctx, gss_buffer_t gssbuf, gss_buffer_t gssmic) | ||
2264 | } | ||
2265 | |||
2266 | int | ||
2267 | -mm_ssh_gssapi_userok(char *user) | ||
2268 | +mm_ssh_gssapi_userok(char *user, struct passwd *pw) | ||
2269 | { | ||
2270 | Buffer m; | ||
2271 | int authenticated = 0; | ||
2272 | @@ -1290,6 +1290,51 @@ mm_ssh_gssapi_userok(char *user) | ||
2273 | debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); | ||
2274 | return (authenticated); | ||
2275 | } | ||
2276 | + | ||
2277 | +OM_uint32 | ||
2278 | +mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) | ||
2279 | +{ | ||
2280 | + Buffer m; | ||
2281 | + OM_uint32 major; | ||
2282 | + u_int len; | ||
2283 | + | ||
2284 | + buffer_init(&m); | ||
2285 | + buffer_put_string(&m, data->value, data->length); | ||
2286 | + | ||
2287 | + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); | ||
2288 | + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); | ||
2289 | + | ||
2290 | + major = buffer_get_int(&m); | ||
2291 | + hash->value = buffer_get_string(&m, &len); | ||
2292 | + hash->length = len; | ||
2293 | + | ||
2294 | + buffer_free(&m); | ||
2295 | + | ||
2296 | + return(major); | ||
2297 | +} | ||
2298 | + | ||
2299 | +int | ||
2300 | +mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *store) | ||
2301 | +{ | ||
2302 | + Buffer m; | ||
2303 | + int ok; | ||
2304 | + | ||
2305 | + buffer_init(&m); | ||
2306 | + | ||
2307 | + buffer_put_cstring(&m, store->filename ? store->filename : ""); | ||
2308 | + buffer_put_cstring(&m, store->envvar ? store->envvar : ""); | ||
2309 | + buffer_put_cstring(&m, store->envval ? store->envval : ""); | ||
2310 | + | ||
2311 | + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUPCREDS, &m); | ||
2312 | + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUPCREDS, &m); | ||
2313 | + | ||
2314 | + ok = buffer_get_int(&m); | ||
2315 | + | ||
2316 | + buffer_free(&m); | ||
2317 | + | ||
2318 | + return (ok); | ||
2319 | +} | ||
2320 | + | ||
2321 | #endif /* GSSAPI */ | ||
2322 | |||
2323 | #ifdef JPAKE | ||
2324 | diff --git a/monitor_wrap.h b/monitor_wrap.h | ||
2325 | index 0c7f2e3..ec9b9b1 100644 | ||
2326 | --- a/monitor_wrap.h | ||
2327 | +++ b/monitor_wrap.h | ||
2328 | @@ -58,8 +58,10 @@ BIGNUM *mm_auth_rsa_generate_challenge(Key *); | ||
2329 | OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | ||
2330 | OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *, | ||
2331 | gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); | ||
2332 | -int mm_ssh_gssapi_userok(char *user); | ||
2333 | +int mm_ssh_gssapi_userok(char *user, struct passwd *); | ||
2334 | OM_uint32 mm_ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); | ||
2335 | +OM_uint32 mm_ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); | ||
2336 | +int mm_ssh_gssapi_update_creds(ssh_gssapi_ccache *); | ||
2337 | #endif | ||
2338 | |||
2339 | #ifdef USE_PAM | ||
2340 | diff --git a/readconf.c b/readconf.c | ||
2341 | index 9c7e73d..cb8bcb2 100644 | ||
2342 | --- a/readconf.c | ||
2343 | +++ b/readconf.c | ||
2344 | @@ -140,6 +140,8 @@ typedef enum { | ||
2345 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, | ||
2346 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, | ||
2347 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, | ||
2348 | + oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey, | ||
2349 | + oGssServerIdentity, | ||
2350 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, | ||
2351 | oSendEnv, oControlPath, oControlMaster, oControlPersist, | ||
2352 | oHashKnownHosts, | ||
2353 | @@ -182,10 +184,19 @@ static struct { | ||
2354 | { "afstokenpassing", oUnsupported }, | ||
2355 | #if defined(GSSAPI) | ||
2356 | { "gssapiauthentication", oGssAuthentication }, | ||
2357 | + { "gssapikeyexchange", oGssKeyEx }, | ||
2358 | { "gssapidelegatecredentials", oGssDelegateCreds }, | ||
2359 | + { "gssapitrustdns", oGssTrustDns }, | ||
2360 | + { "gssapiclientidentity", oGssClientIdentity }, | ||
2361 | + { "gssapiserveridentity", oGssServerIdentity }, | ||
2362 | + { "gssapirenewalforcesrekey", oGssRenewalRekey }, | ||
2363 | #else | ||
2364 | { "gssapiauthentication", oUnsupported }, | ||
2365 | + { "gssapikeyexchange", oUnsupported }, | ||
2366 | { "gssapidelegatecredentials", oUnsupported }, | ||
2367 | + { "gssapitrustdns", oUnsupported }, | ||
2368 | + { "gssapiclientidentity", oUnsupported }, | ||
2369 | + { "gssapirenewalforcesrekey", oUnsupported }, | ||
2370 | #endif | ||
2371 | { "fallbacktorsh", oDeprecated }, | ||
2372 | { "usersh", oDeprecated }, | ||
2373 | @@ -839,10 +850,30 @@ parse_time: | ||
2374 | intptr = &options->gss_authentication; | ||
2375 | goto parse_flag; | ||
2376 | |||
2377 | + case oGssKeyEx: | ||
2378 | + intptr = &options->gss_keyex; | ||
2379 | + goto parse_flag; | ||
2380 | + | ||
2381 | case oGssDelegateCreds: | ||
2382 | intptr = &options->gss_deleg_creds; | ||
2383 | goto parse_flag; | ||
2384 | |||
2385 | + case oGssTrustDns: | ||
2386 | + intptr = &options->gss_trust_dns; | ||
2387 | + goto parse_flag; | ||
2388 | + | ||
2389 | + case oGssClientIdentity: | ||
2390 | + charptr = &options->gss_client_identity; | ||
2391 | + goto parse_string; | ||
2392 | + | ||
2393 | + case oGssServerIdentity: | ||
2394 | + charptr = &options->gss_server_identity; | ||
2395 | + goto parse_string; | ||
2396 | + | ||
2397 | + case oGssRenewalRekey: | ||
2398 | + intptr = &options->gss_renewal_rekey; | ||
2399 | + goto parse_flag; | ||
2400 | + | ||
2401 | case oBatchMode: | ||
2402 | intptr = &options->batch_mode; | ||
2403 | goto parse_flag; | ||
2404 | @@ -1488,7 +1519,12 @@ initialize_options(Options * options) | ||
2405 | options->pubkey_authentication = -1; | ||
2406 | options->challenge_response_authentication = -1; | ||
2407 | options->gss_authentication = -1; | ||
2408 | + options->gss_keyex = -1; | ||
2409 | options->gss_deleg_creds = -1; | ||
2410 | + options->gss_trust_dns = -1; | ||
2411 | + options->gss_renewal_rekey = -1; | ||
2412 | + options->gss_client_identity = NULL; | ||
2413 | + options->gss_server_identity = NULL; | ||
2414 | options->password_authentication = -1; | ||
2415 | options->kbd_interactive_authentication = -1; | ||
2416 | options->kbd_interactive_devices = NULL; | ||
2417 | @@ -1594,8 +1630,14 @@ fill_default_options(Options * options) | ||
2418 | options->challenge_response_authentication = 1; | ||
2419 | if (options->gss_authentication == -1) | ||
2420 | options->gss_authentication = 0; | ||
2421 | + if (options->gss_keyex == -1) | ||
2422 | + options->gss_keyex = 0; | ||
2423 | if (options->gss_deleg_creds == -1) | ||
2424 | options->gss_deleg_creds = 0; | ||
2425 | + if (options->gss_trust_dns == -1) | ||
2426 | + options->gss_trust_dns = 0; | ||
2427 | + if (options->gss_renewal_rekey == -1) | ||
2428 | + options->gss_renewal_rekey = 0; | ||
2429 | if (options->password_authentication == -1) | ||
2430 | options->password_authentication = 1; | ||
2431 | if (options->kbd_interactive_authentication == -1) | ||
2432 | diff --git a/readconf.h b/readconf.h | ||
2433 | index 2d7ea9f..826c676 100644 | ||
2434 | --- a/readconf.h | ||
2435 | +++ b/readconf.h | ||
2436 | @@ -54,7 +54,12 @@ typedef struct { | ||
2437 | int challenge_response_authentication; | ||
2438 | /* Try S/Key or TIS, authentication. */ | ||
2439 | int gss_authentication; /* Try GSS authentication */ | ||
2440 | + int gss_keyex; /* Try GSS key exchange */ | ||
2441 | int gss_deleg_creds; /* Delegate GSS credentials */ | ||
2442 | + int gss_trust_dns; /* Trust DNS for GSS canonicalization */ | ||
2443 | + int gss_renewal_rekey; /* Credential renewal forces rekey */ | ||
2444 | + char *gss_client_identity; /* Principal to initiate GSSAPI with */ | ||
2445 | + char *gss_server_identity; /* GSSAPI target principal */ | ||
2446 | int password_authentication; /* Try password | ||
2447 | * authentication. */ | ||
2448 | int kbd_interactive_authentication; /* Try keyboard-interactive auth. */ | ||
2449 | diff --git a/servconf.c b/servconf.c | ||
2450 | index 9bcd05b..29209e4 100644 | ||
2451 | --- a/servconf.c | ||
2452 | +++ b/servconf.c | ||
2453 | @@ -108,7 +108,10 @@ initialize_server_options(ServerOptions *options) | ||
2454 | options->kerberos_ticket_cleanup = -1; | ||
2455 | options->kerberos_get_afs_token = -1; | ||
2456 | options->gss_authentication=-1; | ||
2457 | + options->gss_keyex = -1; | ||
2458 | options->gss_cleanup_creds = -1; | ||
2459 | + options->gss_strict_acceptor = -1; | ||
2460 | + options->gss_store_rekey = -1; | ||
2461 | options->password_authentication = -1; | ||
2462 | options->kbd_interactive_authentication = -1; | ||
2463 | options->challenge_response_authentication = -1; | ||
2464 | @@ -245,8 +248,14 @@ fill_default_server_options(ServerOptions *options) | ||
2465 | options->kerberos_get_afs_token = 0; | ||
2466 | if (options->gss_authentication == -1) | ||
2467 | options->gss_authentication = 0; | ||
2468 | + if (options->gss_keyex == -1) | ||
2469 | + options->gss_keyex = 0; | ||
2470 | if (options->gss_cleanup_creds == -1) | ||
2471 | options->gss_cleanup_creds = 1; | ||
2472 | + if (options->gss_strict_acceptor == -1) | ||
2473 | + options->gss_strict_acceptor = 1; | ||
2474 | + if (options->gss_store_rekey == -1) | ||
2475 | + options->gss_store_rekey = 0; | ||
2476 | if (options->password_authentication == -1) | ||
2477 | options->password_authentication = 1; | ||
2478 | if (options->kbd_interactive_authentication == -1) | ||
2479 | @@ -343,7 +352,9 @@ typedef enum { | ||
2480 | sBanner, sUseDNS, sHostbasedAuthentication, | ||
2481 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, | ||
2482 | sClientAliveCountMax, sAuthorizedKeysFile, | ||
2483 | - sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, | ||
2484 | + sGssAuthentication, sGssCleanupCreds, sGssStrictAcceptor, | ||
2485 | + sGssKeyEx, sGssStoreRekey, | ||
2486 | + sAcceptEnv, sPermitTunnel, | ||
2487 | sMatch, sPermitOpen, sForceCommand, sChrootDirectory, | ||
2488 | sUsePrivilegeSeparation, sAllowAgentForwarding, | ||
2489 | sZeroKnowledgePasswordAuthentication, sHostCertificate, | ||
2490 | @@ -410,10 +421,20 @@ static struct { | ||
2491 | #ifdef GSSAPI | ||
2492 | { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, | ||
2493 | { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, | ||
2494 | + { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL }, | ||
2495 | + { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, | ||
2496 | + { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, | ||
2497 | + { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, | ||
2498 | #else | ||
2499 | { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, | ||
2500 | { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, | ||
2501 | + { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL }, | ||
2502 | + { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, | ||
2503 | + { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, | ||
2504 | + { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, | ||
2505 | #endif | ||
2506 | + { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL }, | ||
2507 | + { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL }, | ||
2508 | { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, | ||
2509 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, | ||
2510 | { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, | ||
2511 | @@ -1094,10 +1115,22 @@ process_server_config_line(ServerOptions *options, char *line, | ||
2512 | intptr = &options->gss_authentication; | ||
2513 | goto parse_flag; | ||
2514 | |||
2515 | + case sGssKeyEx: | ||
2516 | + intptr = &options->gss_keyex; | ||
2517 | + goto parse_flag; | ||
2518 | + | ||
2519 | case sGssCleanupCreds: | ||
2520 | intptr = &options->gss_cleanup_creds; | ||
2521 | goto parse_flag; | ||
2522 | |||
2523 | + case sGssStrictAcceptor: | ||
2524 | + intptr = &options->gss_strict_acceptor; | ||
2525 | + goto parse_flag; | ||
2526 | + | ||
2527 | + case sGssStoreRekey: | ||
2528 | + intptr = &options->gss_store_rekey; | ||
2529 | + goto parse_flag; | ||
2530 | + | ||
2531 | case sPasswordAuthentication: | ||
2532 | intptr = &options->password_authentication; | ||
2533 | goto parse_flag; | ||
2534 | @@ -2008,7 +2041,10 @@ dump_config(ServerOptions *o) | ||
2535 | #endif | ||
2536 | #ifdef GSSAPI | ||
2537 | dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); | ||
2538 | + dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); | ||
2539 | dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); | ||
2540 | + dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); | ||
2541 | + dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey); | ||
2542 | #endif | ||
2543 | #ifdef JPAKE | ||
2544 | dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication, | ||
2545 | diff --git a/servconf.h b/servconf.h | ||
2546 | index 8812c5a..eba76ee 100644 | ||
2547 | --- a/servconf.h | ||
2548 | +++ b/servconf.h | ||
2549 | @@ -112,7 +112,10 @@ typedef struct { | ||
2550 | int kerberos_get_afs_token; /* If true, try to get AFS token if | ||
2551 | * authenticated with Kerberos. */ | ||
2552 | int gss_authentication; /* If true, permit GSSAPI authentication */ | ||
2553 | + int gss_keyex; /* If true, permit GSSAPI key exchange */ | ||
2554 | int gss_cleanup_creds; /* If true, destroy cred cache on logout */ | ||
2555 | + int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */ | ||
2556 | + int gss_store_rekey; | ||
2557 | int password_authentication; /* If true, permit password | ||
2558 | * authentication. */ | ||
2559 | int kbd_interactive_authentication; /* If true, permit */ | ||
2560 | diff --git a/ssh-gss.h b/ssh-gss.h | ||
2561 | index 077e13c..bc6e8f9 100644 | ||
2562 | --- a/ssh-gss.h | ||
2563 | +++ b/ssh-gss.h | ||
2564 | @@ -1,6 +1,6 @@ | ||
2565 | /* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */ | ||
2566 | /* | ||
2567 | - * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | ||
2568 | + * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. | ||
2569 | * | ||
2570 | * Redistribution and use in source and binary forms, with or without | ||
2571 | * modification, are permitted provided that the following conditions | ||
2572 | @@ -61,10 +61,22 @@ | ||
2573 | |||
2574 | #define SSH_GSS_OIDTYPE 0x06 | ||
2575 | |||
2576 | +#define SSH2_MSG_KEXGSS_INIT 30 | ||
2577 | +#define SSH2_MSG_KEXGSS_CONTINUE 31 | ||
2578 | +#define SSH2_MSG_KEXGSS_COMPLETE 32 | ||
2579 | +#define SSH2_MSG_KEXGSS_HOSTKEY 33 | ||
2580 | +#define SSH2_MSG_KEXGSS_ERROR 34 | ||
2581 | +#define SSH2_MSG_KEXGSS_GROUPREQ 40 | ||
2582 | +#define SSH2_MSG_KEXGSS_GROUP 41 | ||
2583 | +#define KEX_GSS_GRP1_SHA1_ID "gss-group1-sha1-" | ||
2584 | +#define KEX_GSS_GRP14_SHA1_ID "gss-group14-sha1-" | ||
2585 | +#define KEX_GSS_GEX_SHA1_ID "gss-gex-sha1-" | ||
2586 | + | ||
2587 | typedef struct { | ||
2588 | char *filename; | ||
2589 | char *envvar; | ||
2590 | char *envval; | ||
2591 | + struct passwd *owner; | ||
2592 | void *data; | ||
2593 | } ssh_gssapi_ccache; | ||
2594 | |||
2595 | @@ -72,8 +84,11 @@ typedef struct { | ||
2596 | gss_buffer_desc displayname; | ||
2597 | gss_buffer_desc exportedname; | ||
2598 | gss_cred_id_t creds; | ||
2599 | + gss_name_t name; | ||
2600 | struct ssh_gssapi_mech_struct *mech; | ||
2601 | ssh_gssapi_ccache store; | ||
2602 | + int used; | ||
2603 | + int updated; | ||
2604 | } ssh_gssapi_client; | ||
2605 | |||
2606 | typedef struct ssh_gssapi_mech_struct { | ||
2607 | @@ -84,6 +99,7 @@ typedef struct ssh_gssapi_mech_struct { | ||
2608 | int (*userok) (ssh_gssapi_client *, char *); | ||
2609 | int (*localname) (ssh_gssapi_client *, char **); | ||
2610 | void (*storecreds) (ssh_gssapi_client *); | ||
2611 | + int (*updatecreds) (ssh_gssapi_ccache *, ssh_gssapi_client *); | ||
2612 | } ssh_gssapi_mech; | ||
2613 | |||
2614 | typedef struct { | ||
2615 | @@ -94,10 +110,11 @@ typedef struct { | ||
2616 | gss_OID oid; /* client */ | ||
2617 | gss_cred_id_t creds; /* server */ | ||
2618 | gss_name_t client; /* server */ | ||
2619 | - gss_cred_id_t client_creds; /* server */ | ||
2620 | + gss_cred_id_t client_creds; /* both */ | ||
2621 | } Gssctxt; | ||
2622 | |||
2623 | extern ssh_gssapi_mech *supported_mechs[]; | ||
2624 | +extern Gssctxt *gss_kex_context; | ||
2625 | |||
2626 | int ssh_gssapi_check_oid(Gssctxt *, void *, size_t); | ||
2627 | void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); | ||
2628 | @@ -117,16 +134,30 @@ void ssh_gssapi_build_ctx(Gssctxt **); | ||
2629 | void ssh_gssapi_delete_ctx(Gssctxt **); | ||
2630 | OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); | ||
2631 | void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); | ||
2632 | -int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); | ||
2633 | +int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *, const char *); | ||
2634 | +OM_uint32 ssh_gssapi_client_identity(Gssctxt *, const char *); | ||
2635 | +int ssh_gssapi_credentials_updated(Gssctxt *); | ||
2636 | |||
2637 | /* In the server */ | ||
2638 | +typedef int ssh_gssapi_check_fn(Gssctxt **, gss_OID, const char *, | ||
2639 | + const char *); | ||
2640 | +char *ssh_gssapi_client_mechanisms(const char *, const char *); | ||
2641 | +char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *, | ||
2642 | + const char *); | ||
2643 | +gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); | ||
2644 | +int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *, | ||
2645 | + const char *); | ||
2646 | OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID); | ||
2647 | -int ssh_gssapi_userok(char *name); | ||
2648 | +int ssh_gssapi_userok(char *name, struct passwd *); | ||
2649 | OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); | ||
2650 | void ssh_gssapi_do_child(char ***, u_int *); | ||
2651 | void ssh_gssapi_cleanup_creds(void); | ||
2652 | void ssh_gssapi_storecreds(void); | ||
2653 | |||
2654 | +char *ssh_gssapi_server_mechanisms(void); | ||
2655 | +int ssh_gssapi_oid_table_ok(); | ||
2656 | + | ||
2657 | +int ssh_gssapi_update_creds(ssh_gssapi_ccache *store); | ||
2658 | #endif /* GSSAPI */ | ||
2659 | |||
2660 | #endif /* _SSH_GSS_H */ | ||
2661 | diff --git a/ssh_config b/ssh_config | ||
2662 | index 03a228f..228e5ab 100644 | ||
2663 | --- a/ssh_config | ||
2664 | +++ b/ssh_config | ||
2665 | @@ -26,6 +26,8 @@ | ||
2666 | # HostbasedAuthentication no | ||
2667 | # GSSAPIAuthentication no | ||
2668 | # GSSAPIDelegateCredentials no | ||
2669 | +# GSSAPIKeyExchange no | ||
2670 | +# GSSAPITrustDNS no | ||
2671 | # BatchMode no | ||
2672 | # CheckHostIP yes | ||
2673 | # AddressFamily any | ||
2674 | diff --git a/ssh_config.5 b/ssh_config.5 | ||
2675 | index 3cadcd7..49505ae 100644 | ||
2676 | --- a/ssh_config.5 | ||
2677 | +++ b/ssh_config.5 | ||
2678 | @@ -676,11 +676,43 @@ Specifies whether user authentication based on GSSAPI is allowed. | ||
2679 | The default is | ||
2680 | .Dq no . | ||
2681 | Note that this option applies to protocol version 2 only. | ||
2682 | +.It Cm GSSAPIKeyExchange | ||
2683 | +Specifies whether key exchange based on GSSAPI may be used. When using | ||
2684 | +GSSAPI key exchange the server need not have a host key. | ||
2685 | +The default is | ||
2686 | +.Dq no . | ||
2687 | +Note that this option applies to protocol version 2 only. | ||
2688 | +.It Cm GSSAPIClientIdentity | ||
2689 | +If set, specifies the GSSAPI client identity that ssh should use when | ||
2690 | +connecting to the server. The default is unset, which means that the default | ||
2691 | +identity will be used. | ||
2692 | +.It Cm GSSAPIServerIdentity | ||
2693 | +If set, specifies the GSSAPI server identity that ssh should expect when | ||
2694 | +connecting to the server. The default is unset, which means that the | ||
2695 | +expected GSSAPI server identity will be determined from the target | ||
2696 | +hostname. | ||
2697 | .It Cm GSSAPIDelegateCredentials | ||
2698 | Forward (delegate) credentials to the server. | ||
2699 | The default is | ||
2700 | .Dq no . | ||
2701 | -Note that this option applies to protocol version 2 only. | ||
2702 | +Note that this option applies to protocol version 2 connections using GSSAPI. | ||
2703 | +.It Cm GSSAPIRenewalForcesRekey | ||
2704 | +If set to | ||
2705 | +.Dq yes | ||
2706 | +then renewal of the client's GSSAPI credentials will force the rekeying of the | ||
2707 | +ssh connection. With a compatible server, this can delegate the renewed | ||
2708 | +credentials to a session on the server. | ||
2709 | +The default is | ||
2710 | +.Dq no . | ||
2711 | +.It Cm GSSAPITrustDns | ||
2712 | +Set to | ||
2713 | +.Dq yes to indicate that the DNS is trusted to securely canonicalize | ||
2714 | +the name of the host being connected to. If | ||
2715 | +.Dq no, the hostname entered on the | ||
2716 | +command line will be passed untouched to the GSSAPI library. | ||
2717 | +The default is | ||
2718 | +.Dq no . | ||
2719 | +This option only applies to protocol version 2 connections using GSSAPI. | ||
2720 | .It Cm HashKnownHosts | ||
2721 | Indicates that | ||
2722 | .Xr ssh 1 | ||
2723 | diff --git a/sshconnect2.c b/sshconnect2.c | ||
2724 | index 8acffc5..21a269d 100644 | ||
2725 | --- a/sshconnect2.c | ||
2726 | +++ b/sshconnect2.c | ||
2727 | @@ -160,9 +160,34 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | ||
2728 | { | ||
2729 | Kex *kex; | ||
2730 | |||
2731 | +#ifdef GSSAPI | ||
2732 | + char *orig = NULL, *gss = NULL; | ||
2733 | + char *gss_host = NULL; | ||
2734 | +#endif | ||
2735 | + | ||
2736 | xxx_host = host; | ||
2737 | xxx_hostaddr = hostaddr; | ||
2738 | |||
2739 | +#ifdef GSSAPI | ||
2740 | + if (options.gss_keyex) { | ||
2741 | + /* Add the GSSAPI mechanisms currently supported on this | ||
2742 | + * client to the key exchange algorithm proposal */ | ||
2743 | + orig = myproposal[PROPOSAL_KEX_ALGS]; | ||
2744 | + | ||
2745 | + if (options.gss_trust_dns) | ||
2746 | + gss_host = (char *)get_canonical_hostname(1); | ||
2747 | + else | ||
2748 | + gss_host = host; | ||
2749 | + | ||
2750 | + gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity); | ||
2751 | + if (gss) { | ||
2752 | + debug("Offering GSSAPI proposal: %s", gss); | ||
2753 | + xasprintf(&myproposal[PROPOSAL_KEX_ALGS], | ||
2754 | + "%s,%s", gss, orig); | ||
2755 | + } | ||
2756 | + } | ||
2757 | +#endif | ||
2758 | + | ||
2759 | if (options.ciphers == (char *)-1) { | ||
2760 | logit("No valid ciphers for protocol version 2 given, using defaults."); | ||
2761 | options.ciphers = NULL; | ||
2762 | @@ -198,6 +223,17 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | ||
2763 | if (options.kex_algorithms != NULL) | ||
2764 | myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms; | ||
2765 | |||
2766 | +#ifdef GSSAPI | ||
2767 | + /* If we've got GSSAPI algorithms, then we also support the | ||
2768 | + * 'null' hostkey, as a last resort */ | ||
2769 | + if (options.gss_keyex && gss) { | ||
2770 | + orig = myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; | ||
2771 | + xasprintf(&myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], | ||
2772 | + "%s,null", orig); | ||
2773 | + free(gss); | ||
2774 | + } | ||
2775 | +#endif | ||
2776 | + | ||
2777 | if (options.rekey_limit || options.rekey_interval) | ||
2778 | packet_set_rekey_limits((u_int32_t)options.rekey_limit, | ||
2779 | (time_t)options.rekey_interval); | ||
2780 | @@ -210,10 +246,30 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port) | ||
2781 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_client; | ||
2782 | kex->kex[KEX_ECDH_SHA2] = kexecdh_client; | ||
2783 | kex->kex[KEX_C25519_SHA256] = kexc25519_client; | ||
2784 | +#ifdef GSSAPI | ||
2785 | + if (options.gss_keyex) { | ||
2786 | + kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client; | ||
2787 | + kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_client; | ||
2788 | + kex->kex[KEX_GSS_GEX_SHA1] = kexgss_client; | ||
2789 | + } | ||
2790 | +#endif | ||
2791 | kex->client_version_string=client_version_string; | ||
2792 | kex->server_version_string=server_version_string; | ||
2793 | kex->verify_host_key=&verify_host_key_callback; | ||
2794 | |||
2795 | +#ifdef GSSAPI | ||
2796 | + if (options.gss_keyex) { | ||
2797 | + kex->gss_deleg_creds = options.gss_deleg_creds; | ||
2798 | + kex->gss_trust_dns = options.gss_trust_dns; | ||
2799 | + kex->gss_client = options.gss_client_identity; | ||
2800 | + if (options.gss_server_identity) { | ||
2801 | + kex->gss_host = options.gss_server_identity; | ||
2802 | + } else { | ||
2803 | + kex->gss_host = gss_host; | ||
2804 | + } | ||
2805 | + } | ||
2806 | +#endif | ||
2807 | + | ||
2808 | xxx_kex = kex; | ||
2809 | |||
2810 | dispatch_run(DISPATCH_BLOCK, &kex->done, kex); | ||
2811 | @@ -309,6 +365,7 @@ void input_gssapi_token(int type, u_int32_t, void *); | ||
2812 | void input_gssapi_hash(int type, u_int32_t, void *); | ||
2813 | void input_gssapi_error(int, u_int32_t, void *); | ||
2814 | void input_gssapi_errtok(int, u_int32_t, void *); | ||
2815 | +int userauth_gsskeyex(Authctxt *authctxt); | ||
2816 | #endif | ||
2817 | |||
2818 | void userauth(Authctxt *, char *); | ||
2819 | @@ -324,6 +381,11 @@ static char *authmethods_get(void); | ||
2820 | |||
2821 | Authmethod authmethods[] = { | ||
2822 | #ifdef GSSAPI | ||
2823 | + {"gssapi-keyex", | ||
2824 | + userauth_gsskeyex, | ||
2825 | + NULL, | ||
2826 | + &options.gss_authentication, | ||
2827 | + NULL}, | ||
2828 | {"gssapi-with-mic", | ||
2829 | userauth_gssapi, | ||
2830 | NULL, | ||
2831 | @@ -627,19 +689,31 @@ userauth_gssapi(Authctxt *authctxt) | ||
2832 | static u_int mech = 0; | ||
2833 | OM_uint32 min; | ||
2834 | int ok = 0; | ||
2835 | + const char *gss_host; | ||
2836 | + | ||
2837 | + if (options.gss_server_identity) | ||
2838 | + gss_host = options.gss_server_identity; | ||
2839 | + else if (options.gss_trust_dns) | ||
2840 | + gss_host = get_canonical_hostname(1); | ||
2841 | + else | ||
2842 | + gss_host = authctxt->host; | ||
2843 | |||
2844 | /* Try one GSSAPI method at a time, rather than sending them all at | ||
2845 | * once. */ | ||
2846 | |||
2847 | if (gss_supported == NULL) | ||
2848 | - gss_indicate_mechs(&min, &gss_supported); | ||
2849 | + if (GSS_ERROR(gss_indicate_mechs(&min, &gss_supported))) { | ||
2850 | + gss_supported = NULL; | ||
2851 | + return 0; | ||
2852 | + } | ||
2853 | |||
2854 | /* Check to see if the mechanism is usable before we offer it */ | ||
2855 | while (mech < gss_supported->count && !ok) { | ||
2856 | /* My DER encoding requires length<128 */ | ||
2857 | if (gss_supported->elements[mech].length < 128 && | ||
2858 | ssh_gssapi_check_mechanism(&gssctxt, | ||
2859 | - &gss_supported->elements[mech], authctxt->host)) { | ||
2860 | + &gss_supported->elements[mech], gss_host, | ||
2861 | + options.gss_client_identity)) { | ||
2862 | ok = 1; /* Mechanism works */ | ||
2863 | } else { | ||
2864 | mech++; | ||
2865 | @@ -736,8 +810,8 @@ input_gssapi_response(int type, u_int32_t plen, void *ctxt) | ||
2866 | { | ||
2867 | Authctxt *authctxt = ctxt; | ||
2868 | Gssctxt *gssctxt; | ||
2869 | - int oidlen; | ||
2870 | - char *oidv; | ||
2871 | + u_int oidlen; | ||
2872 | + u_char *oidv; | ||
2873 | |||
2874 | if (authctxt == NULL) | ||
2875 | fatal("input_gssapi_response: no authentication context"); | ||
2876 | @@ -846,6 +920,48 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt) | ||
2877 | free(msg); | ||
2878 | free(lang); | ||
2879 | } | ||
2880 | + | ||
2881 | +int | ||
2882 | +userauth_gsskeyex(Authctxt *authctxt) | ||
2883 | +{ | ||
2884 | + Buffer b; | ||
2885 | + gss_buffer_desc gssbuf; | ||
2886 | + gss_buffer_desc mic = GSS_C_EMPTY_BUFFER; | ||
2887 | + OM_uint32 ms; | ||
2888 | + | ||
2889 | + static int attempt = 0; | ||
2890 | + if (attempt++ >= 1) | ||
2891 | + return (0); | ||
2892 | + | ||
2893 | + if (gss_kex_context == NULL) { | ||
2894 | + debug("No valid Key exchange context"); | ||
2895 | + return (0); | ||
2896 | + } | ||
2897 | + | ||
2898 | + ssh_gssapi_buildmic(&b, authctxt->server_user, authctxt->service, | ||
2899 | + "gssapi-keyex"); | ||
2900 | + | ||
2901 | + gssbuf.value = buffer_ptr(&b); | ||
2902 | + gssbuf.length = buffer_len(&b); | ||
2903 | + | ||
2904 | + if (GSS_ERROR(ssh_gssapi_sign(gss_kex_context, &gssbuf, &mic))) { | ||
2905 | + buffer_free(&b); | ||
2906 | + return (0); | ||
2907 | + } | ||
2908 | + | ||
2909 | + packet_start(SSH2_MSG_USERAUTH_REQUEST); | ||
2910 | + packet_put_cstring(authctxt->server_user); | ||
2911 | + packet_put_cstring(authctxt->service); | ||
2912 | + packet_put_cstring(authctxt->method->name); | ||
2913 | + packet_put_string(mic.value, mic.length); | ||
2914 | + packet_send(); | ||
2915 | + | ||
2916 | + buffer_free(&b); | ||
2917 | + gss_release_buffer(&ms, &mic); | ||
2918 | + | ||
2919 | + return (1); | ||
2920 | +} | ||
2921 | + | ||
2922 | #endif /* GSSAPI */ | ||
2923 | |||
2924 | int | ||
2925 | diff --git a/sshd.c b/sshd.c | ||
2926 | index 25380c9..fe65132 100644 | ||
2927 | --- a/sshd.c | ||
2928 | +++ b/sshd.c | ||
2929 | @@ -122,6 +122,10 @@ | ||
2930 | #include "ssh-sandbox.h" | ||
2931 | #include "version.h" | ||
2932 | |||
2933 | +#ifdef USE_SECURITY_SESSION_API | ||
2934 | +#include <Security/AuthSession.h> | ||
2935 | +#endif | ||
2936 | + | ||
2937 | #ifdef LIBWRAP | ||
2938 | #include <tcpd.h> | ||
2939 | #include <syslog.h> | ||
2940 | @@ -1721,10 +1725,13 @@ main(int ac, char **av) | ||
2941 | logit("Disabling protocol version 1. Could not load host key"); | ||
2942 | options.protocol &= ~SSH_PROTO_1; | ||
2943 | } | ||
2944 | +#ifndef GSSAPI | ||
2945 | + /* The GSSAPI key exchange can run without a host key */ | ||
2946 | if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { | ||
2947 | logit("Disabling protocol version 2. Could not load host key"); | ||
2948 | options.protocol &= ~SSH_PROTO_2; | ||
2949 | } | ||
2950 | +#endif | ||
2951 | if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { | ||
2952 | logit("sshd: no hostkeys available -- exiting."); | ||
2953 | exit(1); | ||
2954 | @@ -2051,6 +2058,60 @@ main(int ac, char **av) | ||
2955 | remote_ip, remote_port, | ||
2956 | get_local_ipaddr(sock_in), get_local_port()); | ||
2957 | |||
2958 | +#ifdef USE_SECURITY_SESSION_API | ||
2959 | + /* | ||
2960 | + * Create a new security session for use by the new user login if | ||
2961 | + * the current session is the root session or we are not launched | ||
2962 | + * by inetd (eg: debugging mode or server mode). We do not | ||
2963 | + * necessarily need to create a session if we are launched from | ||
2964 | + * inetd because Panther xinetd will create a session for us. | ||
2965 | + * | ||
2966 | + * The only case where this logic will fail is if there is an | ||
2967 | + * inetd running in a non-root session which is not creating | ||
2968 | + * new sessions for us. Then all the users will end up in the | ||
2969 | + * same session (bad). | ||
2970 | + * | ||
2971 | + * When the client exits, the session will be destroyed for us | ||
2972 | + * automatically. | ||
2973 | + * | ||
2974 | + * We must create the session before any credentials are stored | ||
2975 | + * (including AFS pags, which happens a few lines below). | ||
2976 | + */ | ||
2977 | + { | ||
2978 | + OSStatus err = 0; | ||
2979 | + SecuritySessionId sid = 0; | ||
2980 | + SessionAttributeBits sattrs = 0; | ||
2981 | + | ||
2982 | + err = SessionGetInfo(callerSecuritySession, &sid, &sattrs); | ||
2983 | + if (err) | ||
2984 | + error("SessionGetInfo() failed with error %.8X", | ||
2985 | + (unsigned) err); | ||
2986 | + else | ||
2987 | + debug("Current Session ID is %.8X / Session Attributes are %.8X", | ||
2988 | + (unsigned) sid, (unsigned) sattrs); | ||
2989 | + | ||
2990 | + if (inetd_flag && !(sattrs & sessionIsRoot)) | ||
2991 | + debug("Running in inetd mode in a non-root session... " | ||
2992 | + "assuming inetd created the session for us."); | ||
2993 | + else { | ||
2994 | + debug("Creating new security session..."); | ||
2995 | + err = SessionCreate(0, sessionHasTTY | sessionIsRemote); | ||
2996 | + if (err) | ||
2997 | + error("SessionCreate() failed with error %.8X", | ||
2998 | + (unsigned) err); | ||
2999 | + | ||
3000 | + err = SessionGetInfo(callerSecuritySession, &sid, | ||
3001 | + &sattrs); | ||
3002 | + if (err) | ||
3003 | + error("SessionGetInfo() failed with error %.8X", | ||
3004 | + (unsigned) err); | ||
3005 | + else | ||
3006 | + debug("New Session ID is %.8X / Session Attributes are %.8X", | ||
3007 | + (unsigned) sid, (unsigned) sattrs); | ||
3008 | + } | ||
3009 | + } | ||
3010 | +#endif | ||
3011 | + | ||
3012 | /* | ||
3013 | * We don't want to listen forever unless the other side | ||
3014 | * successfully authenticates itself. So we set up an alarm which is | ||
3015 | @@ -2456,6 +2517,48 @@ do_ssh2_kex(void) | ||
3016 | myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = compat_pkalg_proposal( | ||
3017 | list_hostkey_types()); | ||
3018 | |||
3019 | +#ifdef GSSAPI | ||
3020 | + { | ||
3021 | + char *orig; | ||
3022 | + char *gss = NULL; | ||
3023 | + char *newstr = NULL; | ||
3024 | + orig = myproposal[PROPOSAL_KEX_ALGS]; | ||
3025 | + | ||
3026 | + /* | ||
3027 | + * If we don't have a host key, then there's no point advertising | ||
3028 | + * the other key exchange algorithms | ||
3029 | + */ | ||
3030 | + | ||
3031 | + if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0) | ||
3032 | + orig = NULL; | ||
3033 | + | ||
3034 | + if (options.gss_keyex) | ||
3035 | + gss = ssh_gssapi_server_mechanisms(); | ||
3036 | + else | ||
3037 | + gss = NULL; | ||
3038 | + | ||
3039 | + if (gss && orig) | ||
3040 | + xasprintf(&newstr, "%s,%s", gss, orig); | ||
3041 | + else if (gss) | ||
3042 | + newstr = gss; | ||
3043 | + else if (orig) | ||
3044 | + newstr = orig; | ||
3045 | + | ||
3046 | + /* | ||
3047 | + * If we've got GSSAPI mechanisms, then we've got the 'null' host | ||
3048 | + * key alg, but we can't tell people about it unless its the only | ||
3049 | + * host key algorithm we support | ||
3050 | + */ | ||
3051 | + if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) | ||
3052 | + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = "null"; | ||
3053 | + | ||
3054 | + if (newstr) | ||
3055 | + myproposal[PROPOSAL_KEX_ALGS] = newstr; | ||
3056 | + else | ||
3057 | + fatal("No supported key exchange algorithms"); | ||
3058 | + } | ||
3059 | +#endif | ||
3060 | + | ||
3061 | /* start key exchange */ | ||
3062 | kex = kex_setup(myproposal); | ||
3063 | kex->kex[KEX_DH_GRP1_SHA1] = kexdh_server; | ||
3064 | @@ -2464,6 +2567,13 @@ do_ssh2_kex(void) | ||
3065 | kex->kex[KEX_DH_GEX_SHA256] = kexgex_server; | ||
3066 | kex->kex[KEX_ECDH_SHA2] = kexecdh_server; | ||
3067 | kex->kex[KEX_C25519_SHA256] = kexc25519_server; | ||
3068 | +#ifdef GSSAPI | ||
3069 | + if (options.gss_keyex) { | ||
3070 | + kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_server; | ||
3071 | + kex->kex[KEX_GSS_GRP14_SHA1] = kexgss_server; | ||
3072 | + kex->kex[KEX_GSS_GEX_SHA1] = kexgss_server; | ||
3073 | + } | ||
3074 | +#endif | ||
3075 | kex->server = 1; | ||
3076 | kex->client_version_string=client_version_string; | ||
3077 | kex->server_version_string=server_version_string; | ||
3078 | diff --git a/sshd_config b/sshd_config | ||
3079 | index e9045bc..d9b8594 100644 | ||
3080 | --- a/sshd_config | ||
3081 | +++ b/sshd_config | ||
3082 | @@ -84,6 +84,8 @@ AuthorizedKeysFile .ssh/authorized_keys | ||
3083 | # GSSAPI options | ||
3084 | #GSSAPIAuthentication no | ||
3085 | #GSSAPICleanupCredentials yes | ||
3086 | +#GSSAPIStrictAcceptorCheck yes | ||
3087 | +#GSSAPIKeyExchange no | ||
3088 | |||
3089 | # Set this to 'yes' to enable PAM authentication, account processing, | ||
3090 | # and session processing. If this is enabled, PAM authentication will | ||
3091 | diff --git a/sshd_config.5 b/sshd_config.5 | ||
3092 | index 3b21ea6..9aa9eba 100644 | ||
3093 | --- a/sshd_config.5 | ||
3094 | +++ b/sshd_config.5 | ||
3095 | @@ -493,12 +493,40 @@ Specifies whether user authentication based on GSSAPI is allowed. | ||
3096 | The default is | ||
3097 | .Dq no . | ||
3098 | Note that this option applies to protocol version 2 only. | ||
3099 | +.It Cm GSSAPIKeyExchange | ||
3100 | +Specifies whether key exchange based on GSSAPI is allowed. GSSAPI key exchange | ||
3101 | +doesn't rely on ssh keys to verify host identity. | ||
3102 | +The default is | ||
3103 | +.Dq no . | ||
3104 | +Note that this option applies to protocol version 2 only. | ||
3105 | .It Cm GSSAPICleanupCredentials | ||
3106 | Specifies whether to automatically destroy the user's credentials cache | ||
3107 | on logout. | ||
3108 | The default is | ||
3109 | .Dq yes . | ||
3110 | Note that this option applies to protocol version 2 only. | ||
3111 | +.It Cm GSSAPIStrictAcceptorCheck | ||
3112 | +Determines whether to be strict about the identity of the GSSAPI acceptor | ||
3113 | +a client authenticates against. If | ||
3114 | +.Dq yes | ||
3115 | +then the client must authenticate against the | ||
3116 | +.Pa host | ||
3117 | +service on the current hostname. If | ||
3118 | +.Dq no | ||
3119 | +then the client may authenticate against any service key stored in the | ||
3120 | +machine's default store. This facility is provided to assist with operation | ||
3121 | +on multi homed machines. | ||
3122 | +The default is | ||
3123 | +.Dq yes . | ||
3124 | +Note that this option applies only to protocol version 2 GSSAPI connections, | ||
3125 | +and setting it to | ||
3126 | +.Dq no | ||
3127 | +may only work with recent Kerberos GSSAPI libraries. | ||
3128 | +.It Cm GSSAPIStoreCredentialsOnRekey | ||
3129 | +Controls whether the user's GSSAPI credentials should be updated following a | ||
3130 | +successful connection rekeying. This option can be used to accepted renewed | ||
3131 | +or updated credentials from a compatible client. The default is | ||
3132 | +.Dq no . | ||
3133 | .It Cm HostbasedAuthentication | ||
3134 | Specifies whether rhosts or /etc/hosts.equiv authentication together | ||
3135 | with successful public key client host authentication is allowed | ||
diff --git a/debian/patches/helpful-wait-terminate.patch b/debian/patches/helpful-wait-terminate.patch new file mode 100644 index 000000000..ca90ba124 --- /dev/null +++ b/debian/patches/helpful-wait-terminate.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 71003a35537df521296408d9f6bd0a200ed2a854 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthew Vernon <matthew@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:09:56 +0000 | ||
4 | Subject: Mention ~& when waiting for forwarded connections to terminate | ||
5 | |||
6 | Bug-Debian: http://bugs.debian.org/50308 | ||
7 | Last-Update: 2010-02-27 | ||
8 | |||
9 | Patch-Name: helpful-wait-terminate.patch | ||
10 | --- | ||
11 | serverloop.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/serverloop.c b/serverloop.c | ||
15 | index 5b2f802..d3079d2 100644 | ||
16 | --- a/serverloop.c | ||
17 | +++ b/serverloop.c | ||
18 | @@ -687,7 +687,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg) | ||
19 | if (!channel_still_open()) | ||
20 | break; | ||
21 | if (!waiting_termination) { | ||
22 | - const char *s = "Waiting for forwarded connections to terminate...\r\n"; | ||
23 | + const char *s = "Waiting for forwarded connections to terminate... (press ~& to background)\r\n"; | ||
24 | char *cp; | ||
25 | waiting_termination = 1; | ||
26 | buffer_append(&stderr_buffer, s, strlen(s)); | ||
diff --git a/debian/patches/keepalive-extensions.patch b/debian/patches/keepalive-extensions.patch new file mode 100644 index 000000000..84da73ae0 --- /dev/null +++ b/debian/patches/keepalive-extensions.patch | |||
@@ -0,0 +1,135 @@ | |||
1 | From 043f937820e1152df2c8416f37e6c8d923fc1811 Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Kettlewell <rjk@greenend.org.uk> | ||
3 | Date: Sun, 9 Feb 2014 16:09:52 +0000 | ||
4 | Subject: Various keepalive extensions | ||
5 | |||
6 | Add compatibility aliases for ProtocolKeepAlives and SetupTimeOut, supported | ||
7 | in previous versions of Debian's OpenSSH package but since superseded by | ||
8 | ServerAliveInterval. (We're probably stuck with this bit for | ||
9 | compatibility.) | ||
10 | |||
11 | In batch mode, default ServerAliveInterval to five minutes. | ||
12 | |||
13 | Adjust documentation to match and to give some more advice on use of | ||
14 | keepalives. | ||
15 | |||
16 | Author: Ian Jackson <ian@chiark.greenend.org.uk> | ||
17 | Author: Matthew Vernon <matthew@debian.org> | ||
18 | Author: Colin Watson <cjwatson@debian.org> | ||
19 | Last-Update: 2013-09-14 | ||
20 | |||
21 | Patch-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 | |||
28 | diff --git a/readconf.c b/readconf.c | ||
29 | index 2a1fe8e..e79e355 100644 | ||
30 | --- a/readconf.c | ||
31 | +++ b/readconf.c | ||
32 | @@ -150,6 +150,7 @@ typedef enum { | ||
33 | oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, | ||
34 | oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, | ||
35 | oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, | ||
36 | + oProtocolKeepAlives, oSetupTimeOut, | ||
37 | oIgnoredUnknownOption, oDeprecated, oUnsupported | ||
38 | } OpCodes; | ||
39 | |||
40 | @@ -279,6 +280,8 @@ static struct { | ||
41 | { "canonicalizemaxdots", oCanonicalizeMaxDots }, | ||
42 | { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs }, | ||
43 | { "ignoreunknown", oIgnoreUnknown }, | ||
44 | + { "protocolkeepalives", oProtocolKeepAlives }, | ||
45 | + { "setuptimeout", oSetupTimeOut }, | ||
46 | |||
47 | { NULL, oBadOption } | ||
48 | }; | ||
49 | @@ -1245,6 +1248,8 @@ parse_int: | ||
50 | goto parse_flag; | ||
51 | |||
52 | case oServerAliveInterval: | ||
53 | + case oProtocolKeepAlives: /* Debian-specific compatibility alias */ | ||
54 | + case oSetupTimeOut: /* Debian-specific compatibility alias */ | ||
55 | intptr = &options->server_alive_interval; | ||
56 | goto parse_time; | ||
57 | |||
58 | @@ -1724,8 +1729,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) | ||
74 | diff --git a/ssh_config.5 b/ssh_config.5 | ||
75 | index 617a312..b3c5dc6 100644 | ||
76 | --- a/ssh_config.5 | ||
77 | +++ b/ssh_config.5 | ||
78 | @@ -205,8 +205,12 @@ Valid arguments are | ||
79 | If set to | ||
80 | .Dq yes , | ||
81 | passphrase/password querying will be disabled. | ||
82 | +In addition, the | ||
83 | +.Cm ServerAliveInterval | ||
84 | +option will be set to 300 seconds by default. | ||
85 | This option is useful in scripts and other batch jobs where no user | ||
86 | -is present to supply the password. | ||
87 | +is present to supply the password, | ||
88 | +and where it is desirable to detect a broken network swiftly. | ||
89 | The argument must be | ||
90 | .Dq yes | ||
91 | or | ||
92 | @@ -1299,8 +1303,15 @@ from the server, | ||
93 | will send a message through the encrypted | ||
94 | channel to request a response from the server. | ||
95 | The default | ||
96 | -is 0, indicating that these messages will not be sent to the server. | ||
97 | +is 0, indicating that these messages will not be sent to the server, | ||
98 | +or 300 if the | ||
99 | +.Cm BatchMode | ||
100 | +option is set. | ||
101 | This option applies to protocol version 2 only. | ||
102 | +.Cm ProtocolKeepAlives | ||
103 | +and | ||
104 | +.Cm SetupTimeOut | ||
105 | +are Debian-specific compatibility aliases for this option. | ||
106 | .It Cm StrictHostKeyChecking | ||
107 | If this flag is set to | ||
108 | .Dq yes , | ||
109 | @@ -1339,6 +1350,12 @@ Specifies whether the system should send TCP keepalive messages to the | ||
110 | other side. | ||
111 | If they are sent, death of the connection or crash of one | ||
112 | of the machines will be properly noticed. | ||
113 | +This option only uses TCP keepalives (as opposed to using ssh level | ||
114 | +keepalives), so takes a long time to notice when the connection dies. | ||
115 | +As such, you probably want | ||
116 | +the | ||
117 | +.Cm ServerAliveInterval | ||
118 | +option as well. | ||
119 | However, this means that | ||
120 | connections will die if the route is down temporarily, and some people | ||
121 | find it annoying. | ||
122 | diff --git a/sshd_config.5 b/sshd_config.5 | ||
123 | index 9aa9eba..39643de 100644 | ||
124 | --- a/sshd_config.5 | ||
125 | +++ b/sshd_config.5 | ||
126 | @@ -1168,6 +1168,9 @@ This avoids infinitely hanging sessions. | ||
127 | .Pp | ||
128 | To disable TCP keepalive messages, the value should be set to | ||
129 | .Dq no . | ||
130 | +.Pp | ||
131 | +This option was formerly called | ||
132 | +.Cm KeepAlive . | ||
133 | .It Cm TrustedUserCAKeys | ||
134 | Specifies a file containing public keys of certificate authorities that are | ||
135 | trusted to sign user certificates for authentication. | ||
diff --git a/debian/patches/lintian-symlink-pickiness.patch b/debian/patches/lintian-symlink-pickiness.patch new file mode 100644 index 000000000..588834b5a --- /dev/null +++ b/debian/patches/lintian-symlink-pickiness.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | From cf359c36be95e478071cb0dc4491aba88a5bae70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:08 +0000 | ||
4 | Subject: Fix picky lintian errors about slogin symlinks | ||
5 | |||
6 | Apparently this breaks some SVR4 packaging systems, so upstream can't win | ||
7 | either way and opted to keep the status quo. We need this patch anyway. | ||
8 | |||
9 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1728 | ||
10 | Last-Update: 2013-09-14 | ||
11 | |||
12 | Patch-Name: lintian-symlink-pickiness.patch | ||
13 | --- | ||
14 | Makefile.in | 4 ++-- | ||
15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile.in b/Makefile.in | ||
18 | index 5cf8100..b7de26f 100644 | ||
19 | --- a/Makefile.in | ||
20 | +++ b/Makefile.in | ||
21 | @@ -293,9 +293,9 @@ install-files: | ||
22 | $(INSTALL) -m 644 ssh-keysign.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-keysign.8 | ||
23 | $(INSTALL) -m 644 ssh-pkcs11-helper.8.out $(DESTDIR)$(mandir)/$(mansubdir)8/ssh-pkcs11-helper.8 | ||
24 | -rm -f $(DESTDIR)$(bindir)/slogin | ||
25 | - ln -s ./ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | ||
26 | + ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin | ||
27 | -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | ||
28 | - ln -s ./ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | ||
29 | + ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 | ||
30 | |||
31 | install-sysconf: | ||
32 | if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ | ||
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch new file mode 100644 index 000000000..637d438b9 --- /dev/null +++ b/debian/patches/mention-ssh-keygen-on-keychange.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 9c6deb4e89ad1ac2c2046b1371f378a80b0b4dec Mon Sep 17 00:00:00 2001 | ||
2 | From: Scott Moser <smoser@ubuntu.com> | ||
3 | Date: Sun, 9 Feb 2014 16:10:03 +0000 | ||
4 | Subject: Mention ssh-keygen in ssh fingerprint changed warning | ||
5 | |||
6 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843 | ||
7 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607 | ||
8 | Last-Update: 2013-09-14 | ||
9 | |||
10 | Patch-Name: mention-ssh-keygen-on-keychange.patch | ||
11 | --- | ||
12 | sshconnect.c | 7 ++++++- | ||
13 | 1 file changed, 6 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/sshconnect.c b/sshconnect.c | ||
16 | index ef4d9e0..4ff5c73 100644 | ||
17 | --- a/sshconnect.c | ||
18 | +++ b/sshconnect.c | ||
19 | @@ -1062,9 +1062,12 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | ||
20 | error("%s. This could either mean that", key_msg); | ||
21 | error("DNS SPOOFING is happening or the IP address for the host"); | ||
22 | error("and its host key have changed at the same time."); | ||
23 | - if (ip_status != HOST_NEW) | ||
24 | + if (ip_status != HOST_NEW) { | ||
25 | error("Offending key for IP in %s:%lu", | ||
26 | ip_found->file, ip_found->line); | ||
27 | + error(" remove with: ssh-keygen -f \"%s\" -R %s", | ||
28 | + ip_found->file, ip); | ||
29 | + } | ||
30 | } | ||
31 | /* The host key has changed. */ | ||
32 | warn_changed_key(host_key); | ||
33 | @@ -1072,6 +1075,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | ||
34 | user_hostfiles[0]); | ||
35 | error("Offending %s key in %s:%lu", key_type(host_found->key), | ||
36 | host_found->file, host_found->line); | ||
37 | + error(" remove with: ssh-keygen -f \"%s\" -R %s", | ||
38 | + host_found->file, host); | ||
39 | |||
40 | /* | ||
41 | * If strict host key checking is in use, the user will have | ||
diff --git a/debian/patches/no-openssl-version-check.patch b/debian/patches/no-openssl-version-check.patch new file mode 100644 index 000000000..ca2a83473 --- /dev/null +++ b/debian/patches/no-openssl-version-check.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From db27c81d3de93a0df6cb0f01e9b8b6bf4bb17d06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Philip Hands <phil@hands.com> | ||
3 | Date: Sun, 9 Feb 2014 16:10:14 +0000 | ||
4 | Subject: Disable OpenSSL version check | ||
5 | |||
6 | OpenSSL's SONAME is sufficient nowadays. | ||
7 | |||
8 | Author: Colin Watson <cjwatson@debian.org> | ||
9 | Bug-Debian: http://bugs.debian.org/93581 | ||
10 | Bug-Debian: http://bugs.debian.org/664383 | ||
11 | Forwarded: not-needed | ||
12 | Last-Update: 2013-12-23 | ||
13 | |||
14 | Patch-Name: no-openssl-version-check.patch | ||
15 | --- | ||
16 | entropy.c | 12 ------------ | ||
17 | 1 file changed, 12 deletions(-) | ||
18 | |||
19 | diff --git a/entropy.c b/entropy.c | ||
20 | index 2d483b3..2aee2d9 100644 | ||
21 | --- a/entropy.c | ||
22 | +++ b/entropy.c | ||
23 | @@ -209,18 +209,6 @@ seed_rng(void) | ||
24 | #ifndef OPENSSL_PRNG_ONLY | ||
25 | unsigned char buf[RANDOM_SEED_SIZE]; | ||
26 | #endif | ||
27 | - /* | ||
28 | - * OpenSSL version numbers: MNNFFPPS: major minor fix patch status | ||
29 | - * We match major, minor, fix and status (not patch) for <1.0.0. | ||
30 | - * After that, we acceptable compatible fix versions (so we | ||
31 | - * allow 1.0.1 to work with 1.0.0). Going backwards is only allowed | ||
32 | - * within a patch series. | ||
33 | - */ | ||
34 | - u_long version_mask = SSLeay() >= 0x1000000f ? ~0xffff0L : ~0xff0L; | ||
35 | - if (((SSLeay() ^ OPENSSL_VERSION_NUMBER) & version_mask) || | ||
36 | - (SSLeay() >> 12) < (OPENSSL_VERSION_NUMBER >> 12)) | ||
37 | - fatal("OpenSSL version mismatch. Built against %lx, you " | ||
38 | - "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay()); | ||
39 | |||
40 | #ifndef OPENSSL_PRNG_ONLY | ||
41 | if (RAND_status() == 1) { | ||
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch new file mode 100644 index 000000000..2dbfd31b7 --- /dev/null +++ b/debian/patches/openbsd-docs.patch | |||
@@ -0,0 +1,148 @@ | |||
1 | From 1c4af29874fe7bd1cec92ee90fc613c3cf83f571 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:09 +0000 | ||
4 | Subject: Adjust various OpenBSD-specific references in manual pages | ||
5 | |||
6 | No 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 | |||
12 | Forwarded: not-needed | ||
13 | Last-Update: 2013-09-14 | ||
14 | |||
15 | Patch-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 | |||
24 | diff --git a/moduli.5 b/moduli.5 | ||
25 | index ef0de08..149846c 100644 | ||
26 | --- a/moduli.5 | ||
27 | +++ b/moduli.5 | ||
28 | @@ -21,7 +21,7 @@ | ||
29 | .Nd Diffie-Hellman moduli | ||
30 | .Sh DESCRIPTION | ||
31 | The | ||
32 | -.Pa /etc/moduli | ||
33 | +.Pa /etc/ssh/moduli | ||
34 | file contains prime numbers and generators for use by | ||
35 | .Xr sshd 8 | ||
36 | in the Diffie-Hellman Group Exchange key exchange method. | ||
37 | @@ -110,7 +110,7 @@ first estimates the size of the modulus required to produce enough | ||
38 | Diffie-Hellman output to sufficiently key the selected symmetric cipher. | ||
39 | .Xr sshd 8 | ||
40 | then randomly selects a modulus from | ||
41 | -.Fa /etc/moduli | ||
42 | +.Fa /etc/ssh/moduli | ||
43 | that best meets the size requirement. | ||
44 | .Sh SEE ALSO | ||
45 | .Xr ssh-keygen 1 , | ||
46 | diff --git a/ssh-keygen.1 b/ssh-keygen.1 | ||
47 | index 0e0ed98..299ccf8 100644 | ||
48 | --- a/ssh-keygen.1 | ||
49 | +++ b/ssh-keygen.1 | ||
50 | @@ -172,9 +172,7 @@ key in | ||
51 | .Pa ~/.ssh/id_ed25519 | ||
52 | or | ||
53 | .Pa ~/.ssh/id_rsa . | ||
54 | -Additionally, the system administrator may use this to generate host keys, | ||
55 | -as seen in | ||
56 | -.Pa /etc/rc . | ||
57 | +Additionally, the system administrator may use this to generate host keys. | ||
58 | .Pp | ||
59 | Normally this program generates the key and asks for a file in which | ||
60 | to store the private key. | ||
61 | @@ -221,9 +219,7 @@ For each of the key types (rsa1, rsa, dsa, ecdsa and ed25519) | ||
62 | for which host keys | ||
63 | do not exist, generate the host keys with the default key file path, | ||
64 | an empty passphrase, default bits for the key type, and default comment. | ||
65 | -This is used by | ||
66 | -.Pa /etc/rc | ||
67 | -to generate new host keys. | ||
68 | +This is used by system administration scripts to generate new host keys. | ||
69 | .It Fl a Ar rounds | ||
70 | When saving a new-format private key (i.e. an ed25519 key or any SSH protocol | ||
71 | 2 key when the | ||
72 | @@ -628,7 +624,7 @@ option. | ||
73 | Valid generator values are 2, 3, and 5. | ||
74 | .Pp | ||
75 | Screened DH groups may be installed in | ||
76 | -.Pa /etc/moduli . | ||
77 | +.Pa /etc/ssh/moduli . | ||
78 | It is important that this file contains moduli of a range of bit lengths and | ||
79 | that both ends of a connection share common moduli. | ||
80 | .Sh CERTIFICATES | ||
81 | @@ -827,7 +823,7 @@ on all machines | ||
82 | where the user wishes to log in using public key authentication. | ||
83 | There is no need to keep the contents of this file secret. | ||
84 | .Pp | ||
85 | -.It Pa /etc/moduli | ||
86 | +.It Pa /etc/ssh/moduli | ||
87 | Contains Diffie-Hellman groups used for DH-GEX. | ||
88 | The file format is described in | ||
89 | .Xr moduli 5 . | ||
90 | diff --git a/ssh.1 b/ssh.1 | ||
91 | index ff5e6ac..67b4f44 100644 | ||
92 | --- a/ssh.1 | ||
93 | +++ b/ssh.1 | ||
94 | @@ -763,6 +763,10 @@ Protocol 1 is restricted to using only RSA keys, | ||
95 | but protocol 2 may use any. | ||
96 | The HISTORY section of | ||
97 | .Xr ssl 8 | ||
98 | +(on non-OpenBSD systems, see | ||
99 | +.nh | ||
100 | +http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY) | ||
101 | +.hy | ||
102 | contains a brief discussion of the DSA and RSA algorithms. | ||
103 | .Pp | ||
104 | The file | ||
105 | diff --git a/sshd.8 b/sshd.8 | ||
106 | index e6a900b..b016e90 100644 | ||
107 | --- a/sshd.8 | ||
108 | +++ b/sshd.8 | ||
109 | @@ -70,7 +70,7 @@ over an insecure network. | ||
110 | .Nm | ||
111 | listens for connections from clients. | ||
112 | It is normally started at boot from | ||
113 | -.Pa /etc/rc . | ||
114 | +.Pa /etc/init.d/ssh . | ||
115 | It forks a new | ||
116 | daemon for each incoming connection. | ||
117 | The forked daemons handle | ||
118 | @@ -862,7 +862,7 @@ This file is for host-based authentication (see | ||
119 | .Xr ssh 1 ) . | ||
120 | It should only be writable by root. | ||
121 | .Pp | ||
122 | -.It Pa /etc/moduli | ||
123 | +.It Pa /etc/ssh/moduli | ||
124 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange". | ||
125 | The file format is described in | ||
126 | .Xr moduli 5 . | ||
127 | @@ -961,7 +961,6 @@ The content of this file is not sensitive; it can be world-readable. | ||
128 | .Xr ssh-keyscan 1 , | ||
129 | .Xr chroot 2 , | ||
130 | .Xr hosts_access 5 , | ||
131 | -.Xr login.conf 5 , | ||
132 | .Xr moduli 5 , | ||
133 | .Xr sshd_config 5 , | ||
134 | .Xr inetd 8 , | ||
135 | diff --git a/sshd_config.5 b/sshd_config.5 | ||
136 | index bdca797..9fa6086 100644 | ||
137 | --- a/sshd_config.5 | ||
138 | +++ b/sshd_config.5 | ||
139 | @@ -283,8 +283,7 @@ This option is only available for protocol version 2. | ||
140 | By default, no banner is displayed. | ||
141 | .It Cm ChallengeResponseAuthentication | ||
142 | Specifies whether challenge-response authentication is allowed (e.g. via | ||
143 | -PAM or though authentication styles supported in | ||
144 | -.Xr login.conf 5 ) | ||
145 | +PAM). | ||
146 | The default is | ||
147 | .Dq yes . | ||
148 | .It Cm ChrootDirectory | ||
diff --git a/debian/patches/package-versioning.patch b/debian/patches/package-versioning.patch new file mode 100644 index 000000000..99a2167b3 --- /dev/null +++ b/debian/patches/package-versioning.patch | |||
@@ -0,0 +1,65 @@ | |||
1 | From 03b1ae877da1db4c517747bee89f1a494cce8566 Mon Sep 17 00:00:00 2001 | ||
2 | From: Matthew Vernon <matthew@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:05 +0000 | ||
4 | Subject: Include the Debian version in our identification | ||
5 | |||
6 | This makes it easier to audit networks for versions patched against security | ||
7 | vulnerabilities. It has little detrimental effect, as attackers will | ||
8 | generally just try attacks rather than bothering to scan for | ||
9 | vulnerable-looking version strings. (However, see debian-banner.patch.) | ||
10 | |||
11 | Forwarded: not-needed | ||
12 | Last-Update: 2013-09-14 | ||
13 | |||
14 | Patch-Name: package-versioning.patch | ||
15 | --- | ||
16 | sshconnect.c | 4 ++-- | ||
17 | sshd.c | 2 +- | ||
18 | version.h | 7 ++++++- | ||
19 | 3 files changed, 9 insertions(+), 4 deletions(-) | ||
20 | |||
21 | diff --git a/sshconnect.c b/sshconnect.c | ||
22 | index 4ff5c73..a2fbf9e 100644 | ||
23 | --- a/sshconnect.c | ||
24 | +++ b/sshconnect.c | ||
25 | @@ -517,10 +517,10 @@ send_client_banner(int connection_out, int minor1) | ||
26 | /* Send our own protocol version identification. */ | ||
27 | if (compat20) { | ||
28 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n", | ||
29 | - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION); | ||
30 | + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE); | ||
31 | } else { | ||
32 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", | ||
33 | - PROTOCOL_MAJOR_1, minor1, SSH_VERSION); | ||
34 | + PROTOCOL_MAJOR_1, minor1, SSH_RELEASE); | ||
35 | } | ||
36 | if (roaming_atomicio(vwrite, connection_out, client_version_string, | ||
37 | strlen(client_version_string)) != strlen(client_version_string)) | ||
38 | diff --git a/sshd.c b/sshd.c | ||
39 | index 0a30101..82168a1 100644 | ||
40 | --- a/sshd.c | ||
41 | +++ b/sshd.c | ||
42 | @@ -440,7 +440,7 @@ sshd_exchange_identification(int sock_in, int sock_out) | ||
43 | } | ||
44 | |||
45 | xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s", | ||
46 | - major, minor, SSH_VERSION, | ||
47 | + major, minor, SSH_RELEASE, | ||
48 | *options.version_addendum == '\0' ? "" : " ", | ||
49 | options.version_addendum, newline); | ||
50 | |||
51 | diff --git a/version.h b/version.h | ||
52 | index 83d70c6..0c6ea0f 100644 | ||
53 | --- a/version.h | ||
54 | +++ b/version.h | ||
55 | @@ -3,4 +3,9 @@ | ||
56 | #define SSH_VERSION "OpenSSH_6.5" | ||
57 | |||
58 | #define SSH_PORTABLE "p1" | ||
59 | -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE | ||
60 | +#define SSH_RELEASE_MINIMUM SSH_VERSION SSH_PORTABLE | ||
61 | +#ifdef SSH_EXTRAVERSION | ||
62 | +#define SSH_RELEASE SSH_RELEASE_MINIMUM " " SSH_EXTRAVERSION | ||
63 | +#else | ||
64 | +#define SSH_RELEASE SSH_RELEASE_MINIMUM | ||
65 | +#endif | ||
diff --git a/debian/patches/quieter-signals.patch b/debian/patches/quieter-signals.patch new file mode 100644 index 000000000..18489cabe --- /dev/null +++ b/debian/patches/quieter-signals.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 32e3aad13edff8c03c524105e2c4d4194995573b Mon Sep 17 00:00:00 2001 | ||
2 | From: Peter Samuelson <peter@p12n.org> | ||
3 | Date: Sun, 9 Feb 2014 16:09:55 +0000 | ||
4 | Subject: Reduce severity of "Killed by signal %d" | ||
5 | |||
6 | This produces irritating messages when using ProxyCommand or other programs | ||
7 | that use ssh under the covers (e.g. Subversion). These messages are more | ||
8 | normally printed by the calling program, such as the shell. | ||
9 | |||
10 | According to the upstream bug, the right way to avoid this is to use the -q | ||
11 | option, so we may drop this patch after further investigation into whether | ||
12 | any software in Debian is still relying on it. | ||
13 | |||
14 | Author: Colin Watson <cjwatson@debian.org> | ||
15 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1118 | ||
16 | Bug-Debian: http://bugs.debian.org/313371 | ||
17 | Last-Update: 2013-09-14 | ||
18 | |||
19 | Patch-Name: quieter-signals.patch | ||
20 | --- | ||
21 | clientloop.c | 6 ++++-- | ||
22 | 1 file changed, 4 insertions(+), 2 deletions(-) | ||
23 | |||
24 | diff --git a/clientloop.c b/clientloop.c | ||
25 | index 37b3a04..60c9e87 100644 | ||
26 | --- a/clientloop.c | ||
27 | +++ b/clientloop.c | ||
28 | @@ -1717,8 +1717,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | ||
29 | exit_status = 0; | ||
30 | } | ||
31 | |||
32 | - if (received_signal) | ||
33 | - fatal("Killed by signal %d.", (int) received_signal); | ||
34 | + if (received_signal) { | ||
35 | + debug("Killed by signal %d.", (int) received_signal); | ||
36 | + cleanup_exit((int) received_signal + 128); | ||
37 | + } | ||
38 | |||
39 | /* | ||
40 | * In interactive mode (with pseudo tty) display a message indicating | ||
diff --git a/debian/patches/scp-quoting.patch b/debian/patches/scp-quoting.patch new file mode 100644 index 000000000..a2df78d10 --- /dev/null +++ b/debian/patches/scp-quoting.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 52d571e95114cd6d63b5dc4829f87fd55213c828 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Nicolas=20Valc=C3=A1rcel?= <nvalcarcel@ubuntu.com> | ||
3 | Date: Sun, 9 Feb 2014 16:09:59 +0000 | ||
4 | Subject: Adjust scp quoting in verbose mode | ||
5 | |||
6 | Tweak scp's reporting of filenames in verbose mode to be a bit less | ||
7 | confusing with spaces. | ||
8 | |||
9 | This should be revised to mimic real shell quoting. | ||
10 | |||
11 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/89945 | ||
12 | Last-Update: 2010-02-27 | ||
13 | |||
14 | Patch-Name: scp-quoting.patch | ||
15 | --- | ||
16 | scp.c | 12 ++++++++++-- | ||
17 | 1 file changed, 10 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/scp.c b/scp.c | ||
20 | index 18d3b1d..0669d02 100644 | ||
21 | --- a/scp.c | ||
22 | +++ b/scp.c | ||
23 | @@ -189,8 +189,16 @@ do_local_cmd(arglist *a) | ||
24 | |||
25 | if (verbose_mode) { | ||
26 | fprintf(stderr, "Executing:"); | ||
27 | - for (i = 0; i < a->num; i++) | ||
28 | - fprintf(stderr, " %s", a->list[i]); | ||
29 | + for (i = 0; i < a->num; i++) { | ||
30 | + if (i == 0) | ||
31 | + fprintf(stderr, " %s", a->list[i]); | ||
32 | + else | ||
33 | + /* | ||
34 | + * TODO: misbehaves if a->list[i] contains a | ||
35 | + * single quote | ||
36 | + */ | ||
37 | + fprintf(stderr, " '%s'", a->list[i]); | ||
38 | + } | ||
39 | fprintf(stderr, "\n"); | ||
40 | } | ||
41 | if ((pid = fork()) == -1) | ||
diff --git a/debian/patches/selinux-role.patch b/debian/patches/selinux-role.patch new file mode 100644 index 000000000..dc0ffa300 --- /dev/null +++ b/debian/patches/selinux-role.patch | |||
@@ -0,0 +1,504 @@ | |||
1 | From cc5ecb35ae6572d13ed523d143439a8559d1fee2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Manoj Srivastava <srivasta@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:09:49 +0000 | ||
4 | Subject: Handle SELinux authorisation roles | ||
5 | |||
6 | Rejected upstream due to discomfort with magic usernames; a better approach | ||
7 | will need an SSH protocol change. In the meantime, this came from Debian's | ||
8 | SELinux maintainer, so we'll keep it until we have something better. | ||
9 | |||
10 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1641 | ||
11 | Bug-Debian: http://bugs.debian.org/394795 | ||
12 | Last-Update: 2013-09-14 | ||
13 | |||
14 | Patch-Name: selinux-role.patch | ||
15 | --- | ||
16 | auth.h | 1 + | ||
17 | auth1.c | 8 +++++++- | ||
18 | auth2.c | 10 ++++++++-- | ||
19 | monitor.c | 32 +++++++++++++++++++++++++++++--- | ||
20 | monitor.h | 2 ++ | ||
21 | monitor_wrap.c | 22 ++++++++++++++++++++-- | ||
22 | monitor_wrap.h | 3 ++- | ||
23 | openbsd-compat/port-linux.c | 27 ++++++++++++++++++++------- | ||
24 | openbsd-compat/port-linux.h | 4 ++-- | ||
25 | platform.c | 4 ++-- | ||
26 | platform.h | 2 +- | ||
27 | session.c | 10 +++++----- | ||
28 | session.h | 2 +- | ||
29 | sshd.c | 2 +- | ||
30 | sshpty.c | 4 ++-- | ||
31 | sshpty.h | 2 +- | ||
32 | 16 files changed, 104 insertions(+), 31 deletions(-) | ||
33 | |||
34 | diff --git a/auth.h b/auth.h | ||
35 | index 80f0898..5b6824f 100644 | ||
36 | --- a/auth.h | ||
37 | +++ b/auth.h | ||
38 | @@ -59,6 +59,7 @@ struct Authctxt { | ||
39 | char *service; | ||
40 | struct passwd *pw; /* set if 'valid' */ | ||
41 | char *style; | ||
42 | + char *role; | ||
43 | void *kbdintctxt; | ||
44 | char *info; /* Extra info for next auth_log */ | ||
45 | void *jpake_ctx; | ||
46 | diff --git a/auth1.c b/auth1.c | ||
47 | index f1ac598..2803a3c 100644 | ||
48 | --- a/auth1.c | ||
49 | +++ b/auth1.c | ||
50 | @@ -380,7 +380,7 @@ void | ||
51 | do_authentication(Authctxt *authctxt) | ||
52 | { | ||
53 | u_int ulen; | ||
54 | - char *user, *style = NULL; | ||
55 | + char *user, *style = NULL, *role = NULL; | ||
56 | |||
57 | /* Get the name of the user that we wish to log in as. */ | ||
58 | packet_read_expect(SSH_CMSG_USER); | ||
59 | @@ -389,11 +389,17 @@ do_authentication(Authctxt *authctxt) | ||
60 | user = packet_get_cstring(&ulen); | ||
61 | packet_check_eom(); | ||
62 | |||
63 | + if ((role = strchr(user, '/')) != NULL) | ||
64 | + *role++ = '\0'; | ||
65 | + | ||
66 | if ((style = strchr(user, ':')) != NULL) | ||
67 | *style++ = '\0'; | ||
68 | + else if (role && (style = strchr(role, ':')) != NULL) | ||
69 | + *style++ = '\0'; | ||
70 | |||
71 | authctxt->user = user; | ||
72 | authctxt->style = style; | ||
73 | + authctxt->role = role; | ||
74 | |||
75 | /* Verify that the user is a valid user. */ | ||
76 | if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) | ||
77 | diff --git a/auth2.c b/auth2.c | ||
78 | index 6ed8f04..b55bbcd 100644 | ||
79 | --- a/auth2.c | ||
80 | +++ b/auth2.c | ||
81 | @@ -222,7 +222,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt) | ||
82 | { | ||
83 | Authctxt *authctxt = ctxt; | ||
84 | Authmethod *m = NULL; | ||
85 | - char *user, *service, *method, *style = NULL; | ||
86 | + char *user, *service, *method, *style = NULL, *role = NULL; | ||
87 | int authenticated = 0; | ||
88 | |||
89 | if (authctxt == NULL) | ||
90 | @@ -234,8 +234,13 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt) | ||
91 | debug("userauth-request for user %s service %s method %s", user, service, method); | ||
92 | debug("attempt %d failures %d", authctxt->attempt, authctxt->failures); | ||
93 | |||
94 | + if ((role = strchr(user, '/')) != NULL) | ||
95 | + *role++ = 0; | ||
96 | + | ||
97 | if ((style = strchr(user, ':')) != NULL) | ||
98 | *style++ = 0; | ||
99 | + else if (role && (style = strchr(role, ':')) != NULL) | ||
100 | + *style++ = '\0'; | ||
101 | |||
102 | if (authctxt->attempt++ == 0) { | ||
103 | /* setup auth context */ | ||
104 | @@ -259,8 +264,9 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt) | ||
105 | use_privsep ? " [net]" : ""); | ||
106 | authctxt->service = xstrdup(service); | ||
107 | authctxt->style = style ? xstrdup(style) : NULL; | ||
108 | + authctxt->role = role ? xstrdup(role) : NULL; | ||
109 | if (use_privsep) | ||
110 | - mm_inform_authserv(service, style); | ||
111 | + mm_inform_authserv(service, style, role); | ||
112 | userauth_banner(); | ||
113 | if (auth2_setup_methods_lists(authctxt) != 0) | ||
114 | packet_disconnect("no authentication methods enabled"); | ||
115 | diff --git a/monitor.c b/monitor.c | ||
116 | index a777c4c..88f472e 100644 | ||
117 | --- a/monitor.c | ||
118 | +++ b/monitor.c | ||
119 | @@ -146,6 +146,7 @@ int mm_answer_sign(int, Buffer *); | ||
120 | int mm_answer_pwnamallow(int, Buffer *); | ||
121 | int mm_answer_auth2_read_banner(int, Buffer *); | ||
122 | int mm_answer_authserv(int, Buffer *); | ||
123 | +int mm_answer_authrole(int, Buffer *); | ||
124 | int mm_answer_authpassword(int, Buffer *); | ||
125 | int mm_answer_bsdauthquery(int, Buffer *); | ||
126 | int mm_answer_bsdauthrespond(int, Buffer *); | ||
127 | @@ -227,6 +228,7 @@ struct mon_table mon_dispatch_proto20[] = { | ||
128 | {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, | ||
129 | {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, | ||
130 | {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, | ||
131 | + {MONITOR_REQ_AUTHROLE, MON_ONCE, mm_answer_authrole}, | ||
132 | {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner}, | ||
133 | {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, | ||
134 | #ifdef USE_PAM | ||
135 | @@ -844,6 +846,7 @@ mm_answer_pwnamallow(int sock, Buffer *m) | ||
136 | else { | ||
137 | /* Allow service/style information on the auth context */ | ||
138 | monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); | ||
139 | + monitor_permit(mon_dispatch, MONITOR_REQ_AUTHROLE, 1); | ||
140 | monitor_permit(mon_dispatch, MONITOR_REQ_AUTH2_READ_BANNER, 1); | ||
141 | } | ||
142 | #ifdef USE_PAM | ||
143 | @@ -874,14 +877,37 @@ mm_answer_authserv(int sock, Buffer *m) | ||
144 | |||
145 | authctxt->service = buffer_get_string(m, NULL); | ||
146 | authctxt->style = buffer_get_string(m, NULL); | ||
147 | - debug3("%s: service=%s, style=%s", | ||
148 | - __func__, authctxt->service, authctxt->style); | ||
149 | + authctxt->role = buffer_get_string(m, NULL); | ||
150 | + debug3("%s: service=%s, style=%s, role=%s", | ||
151 | + __func__, authctxt->service, authctxt->style, authctxt->role); | ||
152 | |||
153 | if (strlen(authctxt->style) == 0) { | ||
154 | free(authctxt->style); | ||
155 | authctxt->style = NULL; | ||
156 | } | ||
157 | |||
158 | + if (strlen(authctxt->role) == 0) { | ||
159 | + free(authctxt->role); | ||
160 | + authctxt->role = NULL; | ||
161 | + } | ||
162 | + | ||
163 | + return (0); | ||
164 | +} | ||
165 | + | ||
166 | +int | ||
167 | +mm_answer_authrole(int sock, Buffer *m) | ||
168 | +{ | ||
169 | + monitor_permit_authentications(1); | ||
170 | + | ||
171 | + authctxt->role = buffer_get_string(m, NULL); | ||
172 | + debug3("%s: role=%s", | ||
173 | + __func__, authctxt->role); | ||
174 | + | ||
175 | + if (strlen(authctxt->role) == 0) { | ||
176 | + free(authctxt->role); | ||
177 | + authctxt->role = NULL; | ||
178 | + } | ||
179 | + | ||
180 | return (0); | ||
181 | } | ||
182 | |||
183 | @@ -1486,7 +1512,7 @@ mm_answer_pty(int sock, Buffer *m) | ||
184 | res = pty_allocate(&s->ptyfd, &s->ttyfd, s->tty, sizeof(s->tty)); | ||
185 | if (res == 0) | ||
186 | goto error; | ||
187 | - pty_setowner(authctxt->pw, s->tty); | ||
188 | + pty_setowner(authctxt->pw, s->tty, authctxt->role); | ||
189 | |||
190 | buffer_put_int(m, 1); | ||
191 | buffer_put_cstring(m, s->tty); | ||
192 | diff --git a/monitor.h b/monitor.h | ||
193 | index 315ef99..3c13706 100644 | ||
194 | --- a/monitor.h | ||
195 | +++ b/monitor.h | ||
196 | @@ -73,6 +73,8 @@ enum monitor_reqtype { | ||
197 | MONITOR_REQ_GSSSIGN = 150, MONITOR_ANS_GSSSIGN = 151, | ||
198 | MONITOR_REQ_GSSUPCREDS = 152, MONITOR_ANS_GSSUPCREDS = 153, | ||
199 | |||
200 | + MONITOR_REQ_AUTHROLE = 154, | ||
201 | + | ||
202 | }; | ||
203 | |||
204 | struct mm_master; | ||
205 | diff --git a/monitor_wrap.c b/monitor_wrap.c | ||
206 | index 44019f3..69bc324 100644 | ||
207 | --- a/monitor_wrap.c | ||
208 | +++ b/monitor_wrap.c | ||
209 | @@ -320,10 +320,10 @@ mm_auth2_read_banner(void) | ||
210 | return (banner); | ||
211 | } | ||
212 | |||
213 | -/* Inform the privileged process about service and style */ | ||
214 | +/* Inform the privileged process about service, style, and role */ | ||
215 | |||
216 | void | ||
217 | -mm_inform_authserv(char *service, char *style) | ||
218 | +mm_inform_authserv(char *service, char *style, char *role) | ||
219 | { | ||
220 | Buffer m; | ||
221 | |||
222 | @@ -332,12 +332,30 @@ mm_inform_authserv(char *service, char *style) | ||
223 | buffer_init(&m); | ||
224 | buffer_put_cstring(&m, service); | ||
225 | buffer_put_cstring(&m, style ? style : ""); | ||
226 | + buffer_put_cstring(&m, role ? role : ""); | ||
227 | |||
228 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHSERV, &m); | ||
229 | |||
230 | buffer_free(&m); | ||
231 | } | ||
232 | |||
233 | +/* Inform the privileged process about role */ | ||
234 | + | ||
235 | +void | ||
236 | +mm_inform_authrole(char *role) | ||
237 | +{ | ||
238 | + Buffer m; | ||
239 | + | ||
240 | + debug3("%s entering", __func__); | ||
241 | + | ||
242 | + buffer_init(&m); | ||
243 | + buffer_put_cstring(&m, role ? role : ""); | ||
244 | + | ||
245 | + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_AUTHROLE, &m); | ||
246 | + | ||
247 | + buffer_free(&m); | ||
248 | +} | ||
249 | + | ||
250 | /* Do the password authentication */ | ||
251 | int | ||
252 | mm_auth_password(Authctxt *authctxt, char *password) | ||
253 | diff --git a/monitor_wrap.h b/monitor_wrap.h | ||
254 | index ec9b9b1..4d12e29 100644 | ||
255 | --- a/monitor_wrap.h | ||
256 | +++ b/monitor_wrap.h | ||
257 | @@ -41,7 +41,8 @@ void mm_log_handler(LogLevel, const char *, void *); | ||
258 | int mm_is_monitor(void); | ||
259 | DH *mm_choose_dh(int, int, int); | ||
260 | int mm_key_sign(Key *, u_char **, u_int *, u_char *, u_int); | ||
261 | -void mm_inform_authserv(char *, char *); | ||
262 | +void mm_inform_authserv(char *, char *, char *); | ||
263 | +void mm_inform_authrole(char *); | ||
264 | struct passwd *mm_getpwnamallow(const char *); | ||
265 | char *mm_auth2_read_banner(void); | ||
266 | int mm_auth_password(struct Authctxt *, char *); | ||
267 | diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c | ||
268 | index 4637a7a..de6ad3f 100644 | ||
269 | --- a/openbsd-compat/port-linux.c | ||
270 | +++ b/openbsd-compat/port-linux.c | ||
271 | @@ -29,6 +29,12 @@ | ||
272 | #include <string.h> | ||
273 | #include <stdio.h> | ||
274 | |||
275 | +#ifdef WITH_SELINUX | ||
276 | +#include "key.h" | ||
277 | +#include "hostfile.h" | ||
278 | +#include "auth.h" | ||
279 | +#endif | ||
280 | + | ||
281 | #include "log.h" | ||
282 | #include "xmalloc.h" | ||
283 | #include "port-linux.h" | ||
284 | @@ -58,7 +64,7 @@ ssh_selinux_enabled(void) | ||
285 | |||
286 | /* Return the default security context for the given username */ | ||
287 | static security_context_t | ||
288 | -ssh_selinux_getctxbyname(char *pwname) | ||
289 | +ssh_selinux_getctxbyname(char *pwname, const char *role) | ||
290 | { | ||
291 | security_context_t sc = NULL; | ||
292 | char *sename = NULL, *lvl = NULL; | ||
293 | @@ -73,9 +79,16 @@ ssh_selinux_getctxbyname(char *pwname) | ||
294 | #endif | ||
295 | |||
296 | #ifdef HAVE_GET_DEFAULT_CONTEXT_WITH_LEVEL | ||
297 | - r = get_default_context_with_level(sename, lvl, NULL, &sc); | ||
298 | + if (role != NULL && role[0]) | ||
299 | + r = get_default_context_with_rolelevel(sename, role, lvl, NULL, | ||
300 | + &sc); | ||
301 | + else | ||
302 | + r = get_default_context_with_level(sename, lvl, NULL, &sc); | ||
303 | #else | ||
304 | - r = get_default_context(sename, NULL, &sc); | ||
305 | + if (role != NULL && role[0]) | ||
306 | + r = get_default_context_with_role(sename, role, NULL, &sc); | ||
307 | + else | ||
308 | + r = get_default_context(sename, NULL, &sc); | ||
309 | #endif | ||
310 | |||
311 | if (r != 0) { | ||
312 | @@ -105,7 +118,7 @@ ssh_selinux_getctxbyname(char *pwname) | ||
313 | |||
314 | /* Set the execution context to the default for the specified user */ | ||
315 | void | ||
316 | -ssh_selinux_setup_exec_context(char *pwname) | ||
317 | +ssh_selinux_setup_exec_context(char *pwname, const char *role) | ||
318 | { | ||
319 | security_context_t user_ctx = NULL; | ||
320 | |||
321 | @@ -114,7 +127,7 @@ ssh_selinux_setup_exec_context(char *pwname) | ||
322 | |||
323 | debug3("%s: setting execution context", __func__); | ||
324 | |||
325 | - user_ctx = ssh_selinux_getctxbyname(pwname); | ||
326 | + user_ctx = ssh_selinux_getctxbyname(pwname, role); | ||
327 | if (setexeccon(user_ctx) != 0) { | ||
328 | switch (security_getenforce()) { | ||
329 | case -1: | ||
330 | @@ -136,7 +149,7 @@ ssh_selinux_setup_exec_context(char *pwname) | ||
331 | |||
332 | /* Set the TTY context for the specified user */ | ||
333 | void | ||
334 | -ssh_selinux_setup_pty(char *pwname, const char *tty) | ||
335 | +ssh_selinux_setup_pty(char *pwname, const char *tty, const char *role) | ||
336 | { | ||
337 | security_context_t new_tty_ctx = NULL; | ||
338 | security_context_t user_ctx = NULL; | ||
339 | @@ -147,7 +160,7 @@ ssh_selinux_setup_pty(char *pwname, const char *tty) | ||
340 | |||
341 | debug3("%s: setting TTY context on %s", __func__, tty); | ||
342 | |||
343 | - user_ctx = ssh_selinux_getctxbyname(pwname); | ||
344 | + user_ctx = ssh_selinux_getctxbyname(pwname, role); | ||
345 | |||
346 | /* XXX: should these calls fatal() upon failure in enforcing mode? */ | ||
347 | |||
348 | diff --git a/openbsd-compat/port-linux.h b/openbsd-compat/port-linux.h | ||
349 | index e3d1004..80ce13a 100644 | ||
350 | --- a/openbsd-compat/port-linux.h | ||
351 | +++ b/openbsd-compat/port-linux.h | ||
352 | @@ -21,8 +21,8 @@ | ||
353 | |||
354 | #ifdef WITH_SELINUX | ||
355 | int ssh_selinux_enabled(void); | ||
356 | -void ssh_selinux_setup_pty(char *, const char *); | ||
357 | -void ssh_selinux_setup_exec_context(char *); | ||
358 | +void ssh_selinux_setup_pty(char *, const char *, const char *); | ||
359 | +void ssh_selinux_setup_exec_context(char *, const char *); | ||
360 | void ssh_selinux_change_context(const char *); | ||
361 | void ssh_selinux_setfscreatecon(const char *); | ||
362 | #endif | ||
363 | diff --git a/platform.c b/platform.c | ||
364 | index 30fc609..4aab9a9 100644 | ||
365 | --- a/platform.c | ||
366 | +++ b/platform.c | ||
367 | @@ -142,7 +142,7 @@ platform_setusercontext(struct passwd *pw) | ||
368 | * called if sshd is running as root. | ||
369 | */ | ||
370 | void | ||
371 | -platform_setusercontext_post_groups(struct passwd *pw) | ||
372 | +platform_setusercontext_post_groups(struct passwd *pw, const char *role) | ||
373 | { | ||
374 | #if !defined(HAVE_LOGIN_CAP) && defined(USE_PAM) | ||
375 | /* | ||
376 | @@ -183,7 +183,7 @@ platform_setusercontext_post_groups(struct passwd *pw) | ||
377 | } | ||
378 | #endif /* HAVE_SETPCRED */ | ||
379 | #ifdef WITH_SELINUX | ||
380 | - ssh_selinux_setup_exec_context(pw->pw_name); | ||
381 | + ssh_selinux_setup_exec_context(pw->pw_name, role); | ||
382 | #endif | ||
383 | } | ||
384 | |||
385 | diff --git a/platform.h b/platform.h | ||
386 | index 1c7a45d..436ae7c 100644 | ||
387 | --- a/platform.h | ||
388 | +++ b/platform.h | ||
389 | @@ -27,7 +27,7 @@ void platform_post_fork_parent(pid_t child_pid); | ||
390 | void platform_post_fork_child(void); | ||
391 | int platform_privileged_uidswap(void); | ||
392 | void platform_setusercontext(struct passwd *); | ||
393 | -void platform_setusercontext_post_groups(struct passwd *); | ||
394 | +void platform_setusercontext_post_groups(struct passwd *, const char *); | ||
395 | char *platform_get_krb5_client(const char *); | ||
396 | char *platform_krb5_get_principal_name(const char *); | ||
397 | int platform_sys_dir_uid(uid_t); | ||
398 | diff --git a/session.c b/session.c | ||
399 | index 12dd9ab..5ddd82a 100644 | ||
400 | --- a/session.c | ||
401 | +++ b/session.c | ||
402 | @@ -1497,7 +1497,7 @@ safely_chroot(const char *path, uid_t uid) | ||
403 | |||
404 | /* Set login name, uid, gid, and groups. */ | ||
405 | void | ||
406 | -do_setusercontext(struct passwd *pw) | ||
407 | +do_setusercontext(struct passwd *pw, const char *role) | ||
408 | { | ||
409 | char *chroot_path, *tmp; | ||
410 | |||
411 | @@ -1525,7 +1525,7 @@ do_setusercontext(struct passwd *pw) | ||
412 | endgrent(); | ||
413 | #endif | ||
414 | |||
415 | - platform_setusercontext_post_groups(pw); | ||
416 | + platform_setusercontext_post_groups(pw, role); | ||
417 | |||
418 | if (options.chroot_directory != NULL && | ||
419 | strcasecmp(options.chroot_directory, "none") != 0) { | ||
420 | @@ -1674,7 +1674,7 @@ do_child(Session *s, const char *command) | ||
421 | |||
422 | /* Force a password change */ | ||
423 | if (s->authctxt->force_pwchange) { | ||
424 | - do_setusercontext(pw); | ||
425 | + do_setusercontext(pw, s->authctxt->role); | ||
426 | child_close_fds(); | ||
427 | do_pwchange(s); | ||
428 | exit(1); | ||
429 | @@ -1701,7 +1701,7 @@ do_child(Session *s, const char *command) | ||
430 | /* When PAM is enabled we rely on it to do the nologin check */ | ||
431 | if (!options.use_pam) | ||
432 | do_nologin(pw); | ||
433 | - do_setusercontext(pw); | ||
434 | + do_setusercontext(pw, s->authctxt->role); | ||
435 | /* | ||
436 | * PAM session modules in do_setusercontext may have | ||
437 | * generated messages, so if this in an interactive | ||
438 | @@ -2112,7 +2112,7 @@ session_pty_req(Session *s) | ||
439 | tty_parse_modes(s->ttyfd, &n_bytes); | ||
440 | |||
441 | if (!use_privsep) | ||
442 | - pty_setowner(s->pw, s->tty); | ||
443 | + pty_setowner(s->pw, s->tty, s->authctxt->role); | ||
444 | |||
445 | /* Set window size from the packet. */ | ||
446 | pty_change_window_size(s->ptyfd, s->row, s->col, s->xpixel, s->ypixel); | ||
447 | diff --git a/session.h b/session.h | ||
448 | index 6a2f35e..ef6593c 100644 | ||
449 | --- a/session.h | ||
450 | +++ b/session.h | ||
451 | @@ -77,7 +77,7 @@ void session_pty_cleanup2(Session *); | ||
452 | Session *session_new(void); | ||
453 | Session *session_by_tty(char *); | ||
454 | void session_close(Session *); | ||
455 | -void do_setusercontext(struct passwd *); | ||
456 | +void do_setusercontext(struct passwd *, const char *); | ||
457 | void child_set_env(char ***envp, u_int *envsizep, const char *name, | ||
458 | const char *value); | ||
459 | |||
460 | diff --git a/sshd.c b/sshd.c | ||
461 | index fe65132..0a30101 100644 | ||
462 | --- a/sshd.c | ||
463 | +++ b/sshd.c | ||
464 | @@ -763,7 +763,7 @@ privsep_postauth(Authctxt *authctxt) | ||
465 | bzero(rnd, sizeof(rnd)); | ||
466 | |||
467 | /* Drop privileges */ | ||
468 | - do_setusercontext(authctxt->pw); | ||
469 | + do_setusercontext(authctxt->pw, authctxt->role); | ||
470 | |||
471 | skip: | ||
472 | /* It is safe now to apply the key state */ | ||
473 | diff --git a/sshpty.c b/sshpty.c | ||
474 | index bbbc0fe..8cc26a2 100644 | ||
475 | --- a/sshpty.c | ||
476 | +++ b/sshpty.c | ||
477 | @@ -200,7 +200,7 @@ pty_change_window_size(int ptyfd, u_int row, u_int col, | ||
478 | } | ||
479 | |||
480 | void | ||
481 | -pty_setowner(struct passwd *pw, const char *tty) | ||
482 | +pty_setowner(struct passwd *pw, const char *tty, const char *role) | ||
483 | { | ||
484 | struct group *grp; | ||
485 | gid_t gid; | ||
486 | @@ -227,7 +227,7 @@ pty_setowner(struct passwd *pw, const char *tty) | ||
487 | strerror(errno)); | ||
488 | |||
489 | #ifdef WITH_SELINUX | ||
490 | - ssh_selinux_setup_pty(pw->pw_name, tty); | ||
491 | + ssh_selinux_setup_pty(pw->pw_name, tty, role); | ||
492 | #endif | ||
493 | |||
494 | if (st.st_uid != pw->pw_uid || st.st_gid != gid) { | ||
495 | diff --git a/sshpty.h b/sshpty.h | ||
496 | index cfa3224..edf2436 100644 | ||
497 | --- a/sshpty.h | ||
498 | +++ b/sshpty.h | ||
499 | @@ -24,4 +24,4 @@ int pty_allocate(int *, int *, char *, size_t); | ||
500 | void pty_release(const char *); | ||
501 | void pty_make_controlling_tty(int *, const char *); | ||
502 | void pty_change_window_size(int, u_int, u_int, u_int, u_int); | ||
503 | -void pty_setowner(struct passwd *, const char *); | ||
504 | +void pty_setowner(struct passwd *, const char *, const char *); | ||
diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..f571f76a5 --- /dev/null +++ b/debian/patches/series | |||
@@ -0,0 +1,29 @@ | |||
1 | gssapi.patch | ||
2 | selinux-role.patch | ||
3 | ssh-vulnkey-compat.patch | ||
4 | ssh1-keepalive.patch | ||
5 | keepalive-extensions.patch | ||
6 | syslog-level-silent.patch | ||
7 | quieter-signals.patch | ||
8 | helpful-wait-terminate.patch | ||
9 | consolekit.patch | ||
10 | user-group-modes.patch | ||
11 | scp-quoting.patch | ||
12 | shell-path.patch | ||
13 | dnssec-sshfp.patch | ||
14 | auth-log-verbosity.patch | ||
15 | mention-ssh-keygen-on-keychange.patch | ||
16 | package-versioning.patch | ||
17 | debian-banner.patch | ||
18 | authorized-keys-man-symlink.patch | ||
19 | lintian-symlink-pickiness.patch | ||
20 | openbsd-docs.patch | ||
21 | ssh-argv0.patch | ||
22 | doc-hash-tab-completion.patch | ||
23 | doc-upstart.patch | ||
24 | ssh-agent-setgid.patch | ||
25 | no-openssl-version-check.patch | ||
26 | gnome-ssh-askpass2-icon.patch | ||
27 | sigstop.patch | ||
28 | debian-config.patch | ||
29 | fix-case-sensitive-matching.patch | ||
diff --git a/debian/patches/shell-path.patch b/debian/patches/shell-path.patch new file mode 100644 index 000000000..8f716f8de --- /dev/null +++ b/debian/patches/shell-path.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 95e6f7afe0ca1c16c31845d6fa30453b45b73e0e Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:00 +0000 | ||
4 | Subject: Look for $SHELL on the path for ProxyCommand/LocalCommand | ||
5 | |||
6 | There's some debate on the upstream bug about whether POSIX requires this. | ||
7 | I (Colin Watson) agree with Vincent and think it does. | ||
8 | |||
9 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1494 | ||
10 | Bug-Debian: http://bugs.debian.org/492728 | ||
11 | Last-Update: 2013-09-14 | ||
12 | |||
13 | Patch-Name: shell-path.patch | ||
14 | --- | ||
15 | sshconnect.c | 4 ++-- | ||
16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/sshconnect.c b/sshconnect.c | ||
19 | index d21781e..ef4d9e0 100644 | ||
20 | --- a/sshconnect.c | ||
21 | +++ b/sshconnect.c | ||
22 | @@ -227,7 +227,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) | ||
23 | /* Execute the proxy command. Note that we gave up any | ||
24 | extra privileges above. */ | ||
25 | signal(SIGPIPE, SIG_DFL); | ||
26 | - execv(argv[0], argv); | ||
27 | + execvp(argv[0], argv); | ||
28 | perror(argv[0]); | ||
29 | exit(1); | ||
30 | } | ||
31 | @@ -1384,7 +1384,7 @@ ssh_local_cmd(const char *args) | ||
32 | if (pid == 0) { | ||
33 | signal(SIGPIPE, SIG_DFL); | ||
34 | debug3("Executing %s -c \"%s\"", shell, args); | ||
35 | - execl(shell, shell, "-c", args, (char *)NULL); | ||
36 | + execlp(shell, shell, "-c", args, (char *)NULL); | ||
37 | error("Couldn't execute %s -c \"%s\": %s", | ||
38 | shell, args, strerror(errno)); | ||
39 | _exit(1); | ||
diff --git a/debian/patches/sigstop.patch b/debian/patches/sigstop.patch new file mode 100644 index 000000000..0abebb664 --- /dev/null +++ b/debian/patches/sigstop.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From 6b7aca6f112d216f321466cc7301b5183e772513 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:17 +0000 | ||
4 | Subject: Support synchronisation with service supervisor using SIGSTOP | ||
5 | |||
6 | Forwarded: no | ||
7 | Last-Update: 2013-09-14 | ||
8 | |||
9 | Patch-Name: sigstop.patch | ||
10 | --- | ||
11 | sshd.c | 4 ++++ | ||
12 | 1 file changed, 4 insertions(+) | ||
13 | |||
14 | diff --git a/sshd.c b/sshd.c | ||
15 | index c49a877..23e8c2d 100644 | ||
16 | --- a/sshd.c | ||
17 | +++ b/sshd.c | ||
18 | @@ -1924,6 +1924,10 @@ main(int ac, char **av) | ||
19 | } | ||
20 | } | ||
21 | |||
22 | + if (getenv("SSH_SIGSTOP")) | ||
23 | + /* Tell service supervisor that we are ready. */ | ||
24 | + kill(getpid(), SIGSTOP); | ||
25 | + | ||
26 | /* Accept a connection and return in a forked child */ | ||
27 | server_accept_loop(&sock_in, &sock_out, | ||
28 | &newsock, config_s); | ||
diff --git a/debian/patches/ssh-agent-setgid.patch b/debian/patches/ssh-agent-setgid.patch new file mode 100644 index 000000000..78047d30c --- /dev/null +++ b/debian/patches/ssh-agent-setgid.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 0b9347201e50bd518c09babde3e7650c2b2e9228 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:13 +0000 | ||
4 | Subject: Document consequences of ssh-agent being setgid in ssh-agent(1) | ||
5 | |||
6 | Bug-Debian: http://bugs.debian.org/711623 | ||
7 | Forwarded: no | ||
8 | Last-Update: 2013-06-08 | ||
9 | |||
10 | Patch-Name: ssh-agent-setgid.patch | ||
11 | --- | ||
12 | ssh-agent.1 | 15 +++++++++++++++ | ||
13 | 1 file changed, 15 insertions(+) | ||
14 | |||
15 | diff --git a/ssh-agent.1 b/ssh-agent.1 | ||
16 | index 281ecbd..38fd540 100644 | ||
17 | --- a/ssh-agent.1 | ||
18 | +++ b/ssh-agent.1 | ||
19 | @@ -183,6 +183,21 @@ environment variable holds the agent's process ID. | ||
20 | .Pp | ||
21 | The agent exits automatically when the command given on the command | ||
22 | line terminates. | ||
23 | +.Pp | ||
24 | +In Debian, | ||
25 | +.Nm | ||
26 | +is installed with the set-group-id bit set, to prevent | ||
27 | +.Xr ptrace 2 | ||
28 | +attacks retrieving private key material. | ||
29 | +This has the side-effect of causing the run-time linker to remove certain | ||
30 | +environment variables which might have security implications for set-id | ||
31 | +programs, including | ||
32 | +.Ev LD_PRELOAD , | ||
33 | +.Ev LD_LIBRARY_PATH , | ||
34 | +and | ||
35 | +.Ev TMPDIR . | ||
36 | +If you need to set any of these environment variables, you will need to do | ||
37 | +so in the program executed by ssh-agent. | ||
38 | .Sh FILES | ||
39 | .Bl -tag -width Ds | ||
40 | .It Pa ~/.ssh/identity | ||
diff --git a/debian/patches/ssh-argv0.patch b/debian/patches/ssh-argv0.patch new file mode 100644 index 000000000..53f7d6641 --- /dev/null +++ b/debian/patches/ssh-argv0.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 4e249feb183e35e32cbc0f68cfdfb6bbe09576a9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:10:10 +0000 | ||
4 | Subject: ssh(1): Refer to ssh-argv0(1) | ||
5 | |||
6 | Old versions of OpenSSH (up to 2.5 or thereabouts) allowed creating symlinks | ||
7 | to ssh with the name of the host you want to connect to. Debian ships an | ||
8 | ssh-argv0 script restoring this feature; this patch refers to its manual | ||
9 | page from ssh(1). | ||
10 | |||
11 | Bug-Debian: http://bugs.debian.org/111341 | ||
12 | Forwarded: not-needed | ||
13 | Last-Update: 2013-09-14 | ||
14 | |||
15 | Patch-Name: ssh-argv0.patch | ||
16 | --- | ||
17 | ssh.1 | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/ssh.1 b/ssh.1 | ||
21 | index 67b4f44..9868025 100644 | ||
22 | --- a/ssh.1 | ||
23 | +++ b/ssh.1 | ||
24 | @@ -1468,6 +1468,7 @@ if an error occurred. | ||
25 | .Xr sftp 1 , | ||
26 | .Xr ssh-add 1 , | ||
27 | .Xr ssh-agent 1 , | ||
28 | +.Xr ssh-argv0 1 , | ||
29 | .Xr ssh-keygen 1 , | ||
30 | .Xr ssh-keyscan 1 , | ||
31 | .Xr tun 4 , | ||
diff --git a/debian/patches/ssh-vulnkey-compat.patch b/debian/patches/ssh-vulnkey-compat.patch new file mode 100644 index 000000000..a14f7ae06 --- /dev/null +++ b/debian/patches/ssh-vulnkey-compat.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From 889e217b88a7848e6c997f7f87d07b9d1a35fb49 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@ubuntu.com> | ||
3 | Date: Sun, 9 Feb 2014 16:09:50 +0000 | ||
4 | Subject: Accept obsolete ssh-vulnkey configuration options | ||
5 | |||
6 | These options were used as part of Debian's response to CVE-2008-0166. | ||
7 | Nearly six years later, we no longer need to continue carrying the bulk | ||
8 | of that patch, but we do need to avoid failing when the associated | ||
9 | configuration options are still present. | ||
10 | |||
11 | Last-Update: 2014-02-09 | ||
12 | |||
13 | Patch-Name: ssh-vulnkey-compat.patch | ||
14 | --- | ||
15 | readconf.c | 1 + | ||
16 | servconf.c | 1 + | ||
17 | 2 files changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/readconf.c b/readconf.c | ||
20 | index cb8bcb2..2a1fe8e 100644 | ||
21 | --- a/readconf.c | ||
22 | +++ b/readconf.c | ||
23 | @@ -171,6 +171,7 @@ static struct { | ||
24 | { "passwordauthentication", oPasswordAuthentication }, | ||
25 | { "kbdinteractiveauthentication", oKbdInteractiveAuthentication }, | ||
26 | { "kbdinteractivedevices", oKbdInteractiveDevices }, | ||
27 | + { "useblacklistedkeys", oDeprecated }, | ||
28 | { "rsaauthentication", oRSAAuthentication }, | ||
29 | { "pubkeyauthentication", oPubkeyAuthentication }, | ||
30 | { "dsaauthentication", oPubkeyAuthentication }, /* alias */ | ||
31 | diff --git a/servconf.c b/servconf.c | ||
32 | index 29209e4..65f71ad 100644 | ||
33 | --- a/servconf.c | ||
34 | +++ b/servconf.c | ||
35 | @@ -456,6 +456,7 @@ static struct { | ||
36 | { "x11uselocalhost", sX11UseLocalhost, SSHCFG_ALL }, | ||
37 | { "xauthlocation", sXAuthLocation, SSHCFG_GLOBAL }, | ||
38 | { "strictmodes", sStrictModes, SSHCFG_GLOBAL }, | ||
39 | + { "permitblacklistedkeys", sDeprecated, SSHCFG_GLOBAL }, | ||
40 | { "permitemptypasswords", sEmptyPasswd, SSHCFG_ALL }, | ||
41 | { "permituserenvironment", sPermitUserEnvironment, SSHCFG_GLOBAL }, | ||
42 | { "uselogin", sUseLogin, SSHCFG_GLOBAL }, | ||
diff --git a/debian/patches/ssh1-keepalive.patch b/debian/patches/ssh1-keepalive.patch new file mode 100644 index 000000000..4eab486fe --- /dev/null +++ b/debian/patches/ssh1-keepalive.patch | |||
@@ -0,0 +1,74 @@ | |||
1 | From 9f42d3b964854aecfed2fff64ac375c0c4805fa5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:09:51 +0000 | ||
4 | Subject: Partial server keep-alive implementation for SSH1 | ||
5 | |||
6 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1712 | ||
7 | Last-Update: 2013-09-14 | ||
8 | |||
9 | Patch-Name: ssh1-keepalive.patch | ||
10 | --- | ||
11 | clientloop.c | 25 +++++++++++++++---------- | ||
12 | ssh_config.5 | 5 ++++- | ||
13 | 2 files changed, 19 insertions(+), 11 deletions(-) | ||
14 | |||
15 | diff --git a/clientloop.c b/clientloop.c | ||
16 | index 6d02b0b..37b3a04 100644 | ||
17 | --- a/clientloop.c | ||
18 | +++ b/clientloop.c | ||
19 | @@ -563,16 +563,21 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt) | ||
20 | static void | ||
21 | server_alive_check(void) | ||
22 | { | ||
23 | - if (packet_inc_alive_timeouts() > options.server_alive_count_max) { | ||
24 | - logit("Timeout, server %s not responding.", host); | ||
25 | - cleanup_exit(255); | ||
26 | + if (compat20) { | ||
27 | + if (packet_inc_alive_timeouts() > options.server_alive_count_max) { | ||
28 | + logit("Timeout, server %s not responding.", host); | ||
29 | + cleanup_exit(255); | ||
30 | + } | ||
31 | + packet_start(SSH2_MSG_GLOBAL_REQUEST); | ||
32 | + packet_put_cstring("keepalive@openssh.com"); | ||
33 | + packet_put_char(1); /* boolean: want reply */ | ||
34 | + packet_send(); | ||
35 | + /* Insert an empty placeholder to maintain ordering */ | ||
36 | + client_register_global_confirm(NULL, NULL); | ||
37 | + } else { | ||
38 | + packet_send_ignore(0); | ||
39 | + packet_send(); | ||
40 | } | ||
41 | - packet_start(SSH2_MSG_GLOBAL_REQUEST); | ||
42 | - packet_put_cstring("keepalive@openssh.com"); | ||
43 | - packet_put_char(1); /* boolean: want reply */ | ||
44 | - packet_send(); | ||
45 | - /* Insert an empty placeholder to maintain ordering */ | ||
46 | - client_register_global_confirm(NULL, NULL); | ||
47 | } | ||
48 | |||
49 | /* | ||
50 | @@ -634,7 +639,7 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, | ||
51 | */ | ||
52 | |||
53 | timeout_secs = INT_MAX; /* we use INT_MAX to mean no timeout */ | ||
54 | - if (options.server_alive_interval > 0 && compat20) { | ||
55 | + if (options.server_alive_interval > 0) { | ||
56 | timeout_secs = options.server_alive_interval; | ||
57 | server_alive_time = now + options.server_alive_interval; | ||
58 | } | ||
59 | diff --git a/ssh_config.5 b/ssh_config.5 | ||
60 | index 49505ae..617a312 100644 | ||
61 | --- a/ssh_config.5 | ||
62 | +++ b/ssh_config.5 | ||
63 | @@ -1288,7 +1288,10 @@ If, for example, | ||
64 | .Cm ServerAliveCountMax | ||
65 | is left at the default, if the server becomes unresponsive, | ||
66 | ssh will disconnect after approximately 45 seconds. | ||
67 | -This option applies to protocol version 2 only. | ||
68 | +This option applies to protocol version 2 only; in protocol version | ||
69 | +1 there is no mechanism to request a response from the server to the | ||
70 | +server alive messages, so disconnection is the responsibility of the TCP | ||
71 | +stack. | ||
72 | .It Cm ServerAliveInterval | ||
73 | Sets a timeout interval in seconds after which if no data has been received | ||
74 | from the server, | ||
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch new file mode 100644 index 000000000..682ec3657 --- /dev/null +++ b/debian/patches/syslog-level-silent.patch | |||
@@ -0,0 +1,47 @@ | |||
1 | From 36c21f10bd09ee15eb7f5bd7448309bf9a5cd466 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan David Amery <jdamery@ysolde.ucam.org> | ||
3 | Date: Sun, 9 Feb 2014 16:09:54 +0000 | ||
4 | Subject: "LogLevel SILENT" compatibility | ||
5 | |||
6 | "LogLevel SILENT" (-qq) was introduced in Debian openssh 1:3.0.1p1-1 to | ||
7 | match the behaviour of non-free SSH, in which -q does not suppress fatal | ||
8 | errors. However, this was unintentionally broken in 1:4.6p1-2 and nobody | ||
9 | complained, so we've dropped most of it. The parts that remain are basic | ||
10 | configuration file compatibility, and an adjustment to "Pseudo-terminal will | ||
11 | not be allocated ..." which should be split out into a separate patch. | ||
12 | |||
13 | Author: Matthew Vernon <matthew@debian.org> | ||
14 | Author: Colin Watson <cjwatson@debian.org> | ||
15 | Last-Update: 2013-09-14 | ||
16 | |||
17 | Patch-Name: syslog-level-silent.patch | ||
18 | --- | ||
19 | log.c | 1 + | ||
20 | ssh.c | 2 +- | ||
21 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/log.c b/log.c | ||
24 | index 32e1d2e..53e7b65 100644 | ||
25 | --- a/log.c | ||
26 | +++ b/log.c | ||
27 | @@ -94,6 +94,7 @@ static struct { | ||
28 | LogLevel val; | ||
29 | } log_levels[] = | ||
30 | { | ||
31 | + { "SILENT", SYSLOG_LEVEL_QUIET }, /* compatibility */ | ||
32 | { "QUIET", SYSLOG_LEVEL_QUIET }, | ||
33 | { "FATAL", SYSLOG_LEVEL_FATAL }, | ||
34 | { "ERROR", SYSLOG_LEVEL_ERROR }, | ||
35 | diff --git a/ssh.c b/ssh.c | ||
36 | index 5de8fcf..0cea713 100644 | ||
37 | --- a/ssh.c | ||
38 | +++ b/ssh.c | ||
39 | @@ -889,7 +889,7 @@ main(int ac, char **av) | ||
40 | /* Do not allocate a tty if stdin is not a tty. */ | ||
41 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && | ||
42 | options.request_tty != REQUEST_TTY_FORCE) { | ||
43 | - if (tty_flag) | ||
44 | + if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET) | ||
45 | logit("Pseudo-terminal will not be allocated because " | ||
46 | "stdin is not a terminal."); | ||
47 | tty_flag = 0; | ||
diff --git a/debian/patches/user-group-modes.patch b/debian/patches/user-group-modes.patch new file mode 100644 index 000000000..0bc245ab1 --- /dev/null +++ b/debian/patches/user-group-modes.patch | |||
@@ -0,0 +1,266 @@ | |||
1 | From b63620615d5c8af09e350608233f69191ad6c275 Mon Sep 17 00:00:00 2001 | ||
2 | From: Colin Watson <cjwatson@debian.org> | ||
3 | Date: Sun, 9 Feb 2014 16:09:58 +0000 | ||
4 | Subject: Allow harmless group-writability | ||
5 | |||
6 | Allow secure files (~/.ssh/config, ~/.ssh/authorized_keys, etc.) to be | ||
7 | group-writable, provided that the group in question contains only the file's | ||
8 | owner. Rejected upstream for IMO incorrect reasons (e.g. a misunderstanding | ||
9 | about the contents of gr->gr_mem). Given that per-user groups and umask 002 | ||
10 | are the default setup in Debian (for good reasons - this makes operating in | ||
11 | setgid directories with other groups much easier), we need to permit this by | ||
12 | default. | ||
13 | |||
14 | Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1060 | ||
15 | Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=314347 | ||
16 | Last-Update: 2013-09-14 | ||
17 | |||
18 | Patch-Name: user-group-modes.patch | ||
19 | --- | ||
20 | auth-rhosts.c | 6 ++---- | ||
21 | auth.c | 9 +++----- | ||
22 | misc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- | ||
23 | misc.h | 2 ++ | ||
24 | platform.c | 16 -------------- | ||
25 | readconf.c | 5 +++-- | ||
26 | ssh.1 | 2 ++ | ||
27 | ssh_config.5 | 2 ++ | ||
28 | 8 files changed, 82 insertions(+), 29 deletions(-) | ||
29 | |||
30 | diff --git a/auth-rhosts.c b/auth-rhosts.c | ||
31 | index 06ae7f0..f202787 100644 | ||
32 | --- a/auth-rhosts.c | ||
33 | +++ b/auth-rhosts.c | ||
34 | @@ -256,8 +256,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam | ||
35 | return 0; | ||
36 | } | ||
37 | if (options.strict_modes && | ||
38 | - ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || | ||
39 | - (st.st_mode & 022) != 0)) { | ||
40 | + !secure_permissions(&st, pw->pw_uid)) { | ||
41 | logit("Rhosts authentication refused for %.100s: " | ||
42 | "bad ownership or modes for home directory.", pw->pw_name); | ||
43 | auth_debug_add("Rhosts authentication refused for %.100s: " | ||
44 | @@ -283,8 +282,7 @@ auth_rhosts2_raw(struct passwd *pw, const char *client_user, const char *hostnam | ||
45 | * allowing access to their account by anyone. | ||
46 | */ | ||
47 | if (options.strict_modes && | ||
48 | - ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || | ||
49 | - (st.st_mode & 022) != 0)) { | ||
50 | + !secure_permissions(&st, pw->pw_uid)) { | ||
51 | logit("Rhosts authentication refused for %.100s: bad modes for %.200s", | ||
52 | pw->pw_name, buf); | ||
53 | auth_debug_add("Bad file modes for %.200s", buf); | ||
54 | diff --git a/auth.c b/auth.c | ||
55 | index 9a36f1d..0c45f09 100644 | ||
56 | --- a/auth.c | ||
57 | +++ b/auth.c | ||
58 | @@ -407,8 +407,7 @@ check_key_in_hostfiles(struct passwd *pw, Key *key, const char *host, | ||
59 | user_hostfile = tilde_expand_filename(userfile, pw->pw_uid); | ||
60 | if (options.strict_modes && | ||
61 | (stat(user_hostfile, &st) == 0) && | ||
62 | - ((st.st_uid != 0 && st.st_uid != pw->pw_uid) || | ||
63 | - (st.st_mode & 022) != 0)) { | ||
64 | + !secure_permissions(&st, pw->pw_uid)) { | ||
65 | logit("Authentication refused for %.100s: " | ||
66 | "bad owner or modes for %.200s", | ||
67 | pw->pw_name, user_hostfile); | ||
68 | @@ -470,8 +469,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir, | ||
69 | snprintf(err, errlen, "%s is not a regular file", buf); | ||
70 | return -1; | ||
71 | } | ||
72 | - if ((!platform_sys_dir_uid(stp->st_uid) && stp->st_uid != uid) || | ||
73 | - (stp->st_mode & 022) != 0) { | ||
74 | + if (!secure_permissions(stp, uid)) { | ||
75 | snprintf(err, errlen, "bad ownership or modes for file %s", | ||
76 | buf); | ||
77 | return -1; | ||
78 | @@ -486,8 +484,7 @@ auth_secure_path(const char *name, struct stat *stp, const char *pw_dir, | ||
79 | strlcpy(buf, cp, sizeof(buf)); | ||
80 | |||
81 | if (stat(buf, &st) < 0 || | ||
82 | - (!platform_sys_dir_uid(st.st_uid) && st.st_uid != uid) || | ||
83 | - (st.st_mode & 022) != 0) { | ||
84 | + !secure_permissions(&st, uid)) { | ||
85 | snprintf(err, errlen, | ||
86 | "bad ownership or modes for directory %s", buf); | ||
87 | return -1; | ||
88 | diff --git a/misc.c b/misc.c | ||
89 | index e4c8c32..4e756b0 100644 | ||
90 | --- a/misc.c | ||
91 | +++ b/misc.c | ||
92 | @@ -49,8 +49,9 @@ | ||
93 | #include <netdb.h> | ||
94 | #ifdef HAVE_PATHS_H | ||
95 | # include <paths.h> | ||
96 | -#include <pwd.h> | ||
97 | #endif | ||
98 | +#include <pwd.h> | ||
99 | +#include <grp.h> | ||
100 | #ifdef SSH_TUN_OPENBSD | ||
101 | #include <net/if.h> | ||
102 | #endif | ||
103 | @@ -59,6 +60,7 @@ | ||
104 | #include "misc.h" | ||
105 | #include "log.h" | ||
106 | #include "ssh.h" | ||
107 | +#include "platform.h" | ||
108 | |||
109 | /* remove newline at end of string */ | ||
110 | char * | ||
111 | @@ -643,6 +645,71 @@ read_keyfile_line(FILE *f, const char *filename, char *buf, size_t bufsz, | ||
112 | return -1; | ||
113 | } | ||
114 | |||
115 | +/* | ||
116 | + * return 1 if the specified uid is a uid that may own a system directory | ||
117 | + * otherwise 0. | ||
118 | + */ | ||
119 | +int | ||
120 | +platform_sys_dir_uid(uid_t uid) | ||
121 | +{ | ||
122 | + if (uid == 0) | ||
123 | + return 1; | ||
124 | +#ifdef PLATFORM_SYS_DIR_UID | ||
125 | + if (uid == PLATFORM_SYS_DIR_UID) | ||
126 | + return 1; | ||
127 | +#endif | ||
128 | + return 0; | ||
129 | +} | ||
130 | + | ||
131 | +int | ||
132 | +secure_permissions(struct stat *st, uid_t uid) | ||
133 | +{ | ||
134 | + if (!platform_sys_dir_uid(st->st_uid) && st->st_uid != uid) | ||
135 | + return 0; | ||
136 | + if ((st->st_mode & 002) != 0) | ||
137 | + return 0; | ||
138 | + if ((st->st_mode & 020) != 0) { | ||
139 | + /* If the file is group-writable, the group in question must | ||
140 | + * have exactly one member, namely the file's owner. | ||
141 | + * (Zero-member groups are typically used by setgid | ||
142 | + * binaries, and are unlikely to be suitable.) | ||
143 | + */ | ||
144 | + struct passwd *pw; | ||
145 | + struct group *gr; | ||
146 | + int members = 0; | ||
147 | + | ||
148 | + gr = getgrgid(st->st_gid); | ||
149 | + if (!gr) | ||
150 | + return 0; | ||
151 | + | ||
152 | + /* Check primary group memberships. */ | ||
153 | + while ((pw = getpwent()) != NULL) { | ||
154 | + if (pw->pw_gid == gr->gr_gid) { | ||
155 | + ++members; | ||
156 | + if (pw->pw_uid != uid) | ||
157 | + return 0; | ||
158 | + } | ||
159 | + } | ||
160 | + endpwent(); | ||
161 | + | ||
162 | + pw = getpwuid(st->st_uid); | ||
163 | + if (!pw) | ||
164 | + return 0; | ||
165 | + | ||
166 | + /* Check supplementary group memberships. */ | ||
167 | + if (gr->gr_mem[0]) { | ||
168 | + ++members; | ||
169 | + if (strcmp(pw->pw_name, gr->gr_mem[0]) || | ||
170 | + gr->gr_mem[1]) | ||
171 | + return 0; | ||
172 | + } | ||
173 | + | ||
174 | + if (!members) | ||
175 | + return 0; | ||
176 | + } | ||
177 | + return 1; | ||
178 | +} | ||
179 | + | ||
180 | int | ||
181 | tun_open(int tun, int mode) | ||
182 | { | ||
183 | diff --git a/misc.h b/misc.h | ||
184 | index d4df619..ceb173b 100644 | ||
185 | --- a/misc.h | ||
186 | +++ b/misc.h | ||
187 | @@ -106,4 +106,6 @@ char *read_passphrase(const char *, int); | ||
188 | int ask_permission(const char *, ...) __attribute__((format(printf, 1, 2))); | ||
189 | int read_keyfile_line(FILE *, const char *, char *, size_t, u_long *); | ||
190 | |||
191 | +int secure_permissions(struct stat *st, uid_t uid); | ||
192 | + | ||
193 | #endif /* _MISC_H */ | ||
194 | diff --git a/platform.c b/platform.c | ||
195 | index 4aab9a9..f99de7f 100644 | ||
196 | --- a/platform.c | ||
197 | +++ b/platform.c | ||
198 | @@ -196,19 +196,3 @@ platform_krb5_get_principal_name(const char *pw_name) | ||
199 | return NULL; | ||
200 | #endif | ||
201 | } | ||
202 | - | ||
203 | -/* | ||
204 | - * return 1 if the specified uid is a uid that may own a system directory | ||
205 | - * otherwise 0. | ||
206 | - */ | ||
207 | -int | ||
208 | -platform_sys_dir_uid(uid_t uid) | ||
209 | -{ | ||
210 | - if (uid == 0) | ||
211 | - return 1; | ||
212 | -#ifdef PLATFORM_SYS_DIR_UID | ||
213 | - if (uid == PLATFORM_SYS_DIR_UID) | ||
214 | - return 1; | ||
215 | -#endif | ||
216 | - return 0; | ||
217 | -} | ||
218 | diff --git a/readconf.c b/readconf.c | ||
219 | index e79e355..273552d 100644 | ||
220 | --- a/readconf.c | ||
221 | +++ b/readconf.c | ||
222 | @@ -36,6 +36,8 @@ | ||
223 | #include <stdio.h> | ||
224 | #include <string.h> | ||
225 | #include <unistd.h> | ||
226 | +#include <pwd.h> | ||
227 | +#include <grp.h> | ||
228 | #ifdef HAVE_UTIL_H | ||
229 | #include <util.h> | ||
230 | #endif | ||
231 | @@ -1475,8 +1477,7 @@ read_config_file(const char *filename, struct passwd *pw, const char *host, | ||
232 | |||
233 | if (fstat(fileno(f), &sb) == -1) | ||
234 | fatal("fstat %s: %s", filename, strerror(errno)); | ||
235 | - if (((sb.st_uid != 0 && sb.st_uid != getuid()) || | ||
236 | - (sb.st_mode & 022) != 0)) | ||
237 | + if (!secure_permissions(&sb, getuid())) | ||
238 | fatal("Bad owner or permissions on %s", filename); | ||
239 | } | ||
240 | |||
241 | diff --git a/ssh.1 b/ssh.1 | ||
242 | index 27794e2..ff5e6ac 100644 | ||
243 | --- a/ssh.1 | ||
244 | +++ b/ssh.1 | ||
245 | @@ -1352,6 +1352,8 @@ The file format and configuration options are described in | ||
246 | .Xr ssh_config 5 . | ||
247 | Because of the potential for abuse, this file must have strict permissions: | ||
248 | read/write for the user, and not writable by others. | ||
249 | +It may be group-writable provided that the group in question contains only | ||
250 | +the user. | ||
251 | .Pp | ||
252 | .It Pa ~/.ssh/environment | ||
253 | Contains additional definitions for environment variables; see | ||
254 | diff --git a/ssh_config.5 b/ssh_config.5 | ||
255 | index b3c5dc6..3c6b9d4 100644 | ||
256 | --- a/ssh_config.5 | ||
257 | +++ b/ssh_config.5 | ||
258 | @@ -1523,6 +1523,8 @@ The format of this file is described above. | ||
259 | This file is used by the SSH client. | ||
260 | Because of the potential for abuse, this file must have strict permissions: | ||
261 | read/write for the user, and not accessible by others. | ||
262 | +It may be group-writable provided that the group in question contains only | ||
263 | +the user. | ||
264 | .It Pa /etc/ssh/ssh_config | ||
265 | Systemwide configuration file. | ||
266 | This file provides defaults for those | ||
diff --git a/debian/rules b/debian/rules new file mode 100755 index 000000000..0b63cbd48 --- /dev/null +++ b/debian/rules | |||
@@ -0,0 +1,221 @@ | |||
1 | #!/usr/bin/make -f | ||
2 | |||
3 | # Uncomment this to turn on verbose mode. | ||
4 | # export DH_VERBOSE=1 | ||
5 | |||
6 | # This has to be exported to make some magic below work. | ||
7 | export DH_OPTIONS | ||
8 | |||
9 | ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) | ||
10 | RUN_TESTS := yes | ||
11 | else | ||
12 | RUN_TESTS := | ||
13 | endif | ||
14 | |||
15 | ifeq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) | ||
16 | PARALLEL := | ||
17 | else | ||
18 | PARALLEL := \ | ||
19 | -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) | ||
20 | endif | ||
21 | |||
22 | DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) | ||
23 | DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) | ||
24 | |||
25 | ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) | ||
26 | CC := gcc | ||
27 | PKG_CONFIG = pkg-config | ||
28 | else | ||
29 | CC := $(DEB_HOST_GNU_TYPE)-gcc | ||
30 | PKG_CONFIG = $(DEB_HOST_GNU_TYPE)-pkg-config | ||
31 | RUN_TESTS := | ||
32 | endif | ||
33 | |||
34 | DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) | ||
35 | |||
36 | # Take account of old dpkg-architecture output. | ||
37 | ifeq ($(DEB_HOST_ARCH_OS),) | ||
38 | DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)) | ||
39 | ifeq ($(DEB_HOST_ARCH_OS),gnu) | ||
40 | DEB_HOST_ARCH_OS := hurd | ||
41 | endif | ||
42 | endif | ||
43 | |||
44 | # Change the version string to reflect distribution | ||
45 | DISTRIBUTION := $(shell dpkg-vendor --query vendor) | ||
46 | SSH_EXTRAVERSION := $(DISTRIBUTION)-$(shell dpkg-parsechangelog | sed -n -e '/^Version:/s/Version: //p' | sed -e 's/[^-]*-//') | ||
47 | |||
48 | DISTRIBUTOR := $(shell if dpkg-vendor --derives-from Ubuntu 2>/dev/null; then echo Ubuntu; else echo Debian; fi) | ||
49 | ifeq ($(DISTRIBUTOR),Ubuntu) | ||
50 | DEFAULT_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games | ||
51 | else | ||
52 | DEFAULT_PATH := /usr/local/bin:/usr/bin:/bin:/usr/games | ||
53 | endif | ||
54 | SUPERUSER_PATH := /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin | ||
55 | |||
56 | ifeq ($(DISTRIBUTOR),Ubuntu) | ||
57 | server_recommends := ssh-import-id | ||
58 | else | ||
59 | server_recommends := | ||
60 | endif | ||
61 | |||
62 | # Common path configuration. | ||
63 | confflags += --sysconfdir=/etc/ssh | ||
64 | |||
65 | # Common build options. | ||
66 | confflags += --disable-strip | ||
67 | confflags += --with-mantype=doc | ||
68 | confflags += --with-4in6 | ||
69 | confflags += --with-privsep-path=/var/run/sshd | ||
70 | |||
71 | # The Hurd needs libcrypt for res_query et al. | ||
72 | ifeq ($(DEB_HOST_ARCH_OS),hurd) | ||
73 | confflags += --with-libs=-lcrypt | ||
74 | endif | ||
75 | |||
76 | # Everything above here is common to the deb and udeb builds. | ||
77 | confflags_udeb := $(confflags) | ||
78 | |||
79 | # Options specific to the deb build. | ||
80 | confflags += --with-tcp-wrappers | ||
81 | confflags += --with-pam | ||
82 | confflags += --with-libedit | ||
83 | confflags += --with-kerberos5=/usr | ||
84 | confflags += --with-ssl-engine | ||
85 | ifeq ($(DEB_HOST_ARCH_OS),linux) | ||
86 | confflags += --with-selinux | ||
87 | endif | ||
88 | ifeq ($(DISTRIBUTOR),Ubuntu) | ||
89 | confflags += --with-consolekit | ||
90 | endif | ||
91 | |||
92 | # The deb build wants xauth; the udeb build doesn't. | ||
93 | confflags += --with-xauth=/usr/bin/xauth | ||
94 | confflags_udeb += --without-xauth | ||
95 | |||
96 | # Default paths. The udeb build has /usr/games removed. | ||
97 | confflags += --with-default-path=$(DEFAULT_PATH) --with-superuser-path=$(SUPERUSER_PATH) | ||
98 | confflags_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 | ||
99 | |||
100 | # Compiler flags. | ||
101 | export DEB_BUILD_MAINT_OPTIONS := hardening=+all | ||
102 | default_cflags := $(shell dpkg-buildflags --get CPPFLAGS) $(shell dpkg-buildflags --get CFLAGS) | ||
103 | cflags := $(default_cflags) | ||
104 | cflags += -DLOGIN_PROGRAM=\"/bin/login\" -DLOGIN_NO_ENDOPT | ||
105 | cflags += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" | ||
106 | cflags_udeb := -Os | ||
107 | cflags_udeb += -DSSH_EXTRAVERSION=\"$(SSH_EXTRAVERSION)\" | ||
108 | confflags += --with-cflags='$(cflags)' | ||
109 | confflags_udeb += --with-cflags='$(cflags_udeb)' | ||
110 | |||
111 | # Linker flags. | ||
112 | default_ldflags := $(shell dpkg-buildflags --get LDFLAGS) | ||
113 | confflags += --with-ldflags='$(strip -Wl,--as-needed $(default_ldflags))' | ||
114 | confflags_udeb += --with-ldflags='-Wl,--as-needed' | ||
115 | |||
116 | %: | ||
117 | dh $@ --with=autoreconf,systemd | ||
118 | |||
119 | autoreconf: | ||
120 | autoreconf -f -i | ||
121 | cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./ | ||
122 | |||
123 | override_dh_autoreconf: | ||
124 | dh_autoreconf debian/rules -- autoreconf | ||
125 | |||
126 | override_dh_auto_configure: | ||
127 | dh_auto_configure -Bbuild-deb -- $(confflags) | ||
128 | dh_auto_configure -Bbuild-udeb -- $(confflags_udeb) | ||
129 | |||
130 | override_dh_auto_build: | ||
131 | # Debian's /var/log/btmp has inappropriate permissions. | ||
132 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-deb/config.h | ||
133 | perl -pi -e 's,.*#define USE_BTMP .*,/* #undef USE_BTMP */,' build-udeb/config.h | ||
134 | |||
135 | # Avoid libnsl linkage. Ugh. | ||
136 | perl -pi -e 's/ +-lnsl//' build-udeb/config.status | ||
137 | cd build-udeb && ./config.status | ||
138 | |||
139 | $(MAKE) -C build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' | ||
140 | $(MAKE) -C build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen | ||
141 | |||
142 | $(MAKE) -C contrib gnome-ssh-askpass2 CC='$(CC) $(default_cflags) -Wall -Wl,--as-needed $(default_ldflags)' PKG_CONFIG=$(PKG_CONFIG) | ||
143 | |||
144 | override_dh_auto_test: | ||
145 | ifeq ($(RUN_TESTS),yes) | ||
146 | $(MAKE) -C debian/tests | ||
147 | endif | ||
148 | |||
149 | override_dh_auto_clean: | ||
150 | rm -rf build-deb build-udeb | ||
151 | ifeq ($(RUN_TESTS),yes) | ||
152 | $(MAKE) -C debian/tests clean | ||
153 | endif | ||
154 | $(MAKE) -C contrib clean | ||
155 | (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \ | ||
156 | > debian/copyright | ||
157 | |||
158 | override_dh_auto_install: | ||
159 | $(MAKE) -C build-deb DESTDIR=`pwd`/debian/tmp install-nokeys | ||
160 | |||
161 | override_dh_install: | ||
162 | rm -f debian/tmp/etc/ssh/sshd_config | ||
163 | |||
164 | dh_install -Nopenssh-client-udeb -Nopenssh-server-udeb --fail-missing | ||
165 | dh_install -popenssh-client-udeb -popenssh-server-udeb \ | ||
166 | --sourcedir=build-udeb | ||
167 | |||
168 | install -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass | ||
169 | |||
170 | install -o root -g root debian/openssh-server.if-up debian/openssh-server/etc/network/if-up.d/openssh-server | ||
171 | install -o root -g root -m 644 debian/openssh-server.ufw.profile debian/openssh-server/etc/ufw/applications.d/openssh-server | ||
172 | |||
173 | # Remove version control tags to avoid unnecessary conffile | ||
174 | # resolution steps for administrators. | ||
175 | sed -i '/\$$OpenBSD:/d' \ | ||
176 | debian/openssh-client/etc/ssh/moduli \ | ||
177 | debian/openssh-client/etc/ssh/ssh_config | ||
178 | |||
179 | # dh_apport would be neater, but at the time of writing it isn't in | ||
180 | # unstable yet. | ||
181 | install -p -m 644 debian/openssh-client.apport debian/openssh-client/usr/share/apport/package-hooks/openssh-client.py | ||
182 | install -p -m 644 debian/openssh-server.apport debian/openssh-server/usr/share/apport/package-hooks/openssh-server.py | ||
183 | |||
184 | # Upstart user job (only used under user sessions) | ||
185 | install -p -m 644 -D debian/ssh-agent.user-session.upstart debian/openssh-client/usr/share/upstart/sessions/ssh-agent.conf | ||
186 | |||
187 | override_dh_installdocs: | ||
188 | dh_installdocs -Nopenssh-server -Nssh | ||
189 | dh_installdocs -popenssh-server -pssh --link-doc=openssh-client | ||
190 | # Avoid breaking dh_installexamples later. | ||
191 | mkdir -p debian/openssh-server/usr/share/doc/openssh-client | ||
192 | |||
193 | override_dh_systemd_enable: | ||
194 | dh_systemd_enable --name ssh ssh.service | ||
195 | dh_systemd_enable --name ssh --no-enable ssh.socket | ||
196 | |||
197 | override_dh_installinit: | ||
198 | dh_installinit -R --name ssh -- start 16 2 3 4 5 . | ||
199 | |||
200 | override_dh_installpam: | ||
201 | dh_installpam --name sshd | ||
202 | |||
203 | override_dh_fixperms: | ||
204 | dh_fixperms | ||
205 | chmod u+s debian/openssh-client/usr/lib/openssh/ssh-keysign | ||
206 | |||
207 | # Tighten libssl dependencies to match the check in entropy.c. | ||
208 | override_dh_shlibdeps: | ||
209 | dh_shlibdeps | ||
210 | debian/adjust-openssl-dependencies | ||
211 | |||
212 | override_dh_gencontrol: | ||
213 | dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)' | ||
214 | |||
215 | override_dh_builddeb: | ||
216 | dh_builddeb -- -Zxz | ||
217 | |||
218 | debian/faq.html: | ||
219 | wget -O - http://www.openssh.org/faq.html | \ | ||
220 | sed 's,\(href="\)\(txt/\|[^":]*\.html\),\1http://www.openssh.org/\2,g' \ | ||
221 | > debian/faq.html | ||
diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/debian/source/format | |||
@@ -0,0 +1 @@ | |||
3.0 (quilt) | |||
diff --git a/debian/source/include-binaries b/debian/source/include-binaries new file mode 100644 index 000000000..df5790e2e --- /dev/null +++ b/debian/source/include-binaries | |||
@@ -0,0 +1 @@ | |||
debian/ssh-askpass-gnome.png | |||
diff --git a/debian/ssh-agent.user-session.upstart b/debian/ssh-agent.user-session.upstart new file mode 100644 index 000000000..8553e12f1 --- /dev/null +++ b/debian/ssh-agent.user-session.upstart | |||
@@ -0,0 +1,19 @@ | |||
1 | description "SSH Agent" | ||
2 | author "Stéphane Graber <stgraber@ubuntu.com>" | ||
3 | |||
4 | start on starting xsession-init | ||
5 | |||
6 | pre-start script | ||
7 | [ -e /etc/X11/Xsession.options ] || { stop; exit 0; } | ||
8 | grep -q "^use-ssh-agent$" /etc/X11/Xsession.options || { stop; exit 0; } | ||
9 | |||
10 | eval "$(ssh-agent)" >/dev/null | ||
11 | initctl set-env --global SSH_AUTH_SOCK=$SSH_AUTH_SOCK | ||
12 | initctl set-env --global SSH_AGENT_PID=$SSH_AGENT_PID | ||
13 | end script | ||
14 | |||
15 | post-stop script | ||
16 | kill $SSH_AGENT_PID 2>/dev/null || true | ||
17 | initctl unset-env --global SSH_AUTH_SOCK | ||
18 | initctl unset-env --global SSH_AGENT_PID | ||
19 | end script | ||
diff --git a/debian/ssh-argv0 b/debian/ssh-argv0 new file mode 100644 index 000000000..37506a4d7 --- /dev/null +++ b/debian/ssh-argv0 | |||
@@ -0,0 +1,31 @@ | |||
1 | #! /bin/sh | ||
2 | set -e | ||
3 | |||
4 | # Copyright (c) 2001 Jonathan Amery. | ||
5 | # | ||
6 | # Redistribution and use in source and binary forms, with or without | ||
7 | # modification, are permitted provided that the following conditions | ||
8 | # are met: | ||
9 | # 1. Redistributions of source code must retain the above copyright | ||
10 | # notice, this list of conditions and the following disclaimer. | ||
11 | # 2. Redistributions in binary form must reproduce the above copyright | ||
12 | # notice, this list of conditions and the following disclaimer in the | ||
13 | # documentation and/or other materials provided with the distribution. | ||
14 | # | ||
15 | # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | ||
16 | # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
17 | # OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
18 | # IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
19 | # INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
20 | # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
21 | # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
22 | # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
23 | # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
24 | # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
25 | |||
26 | if [ "${0##*/}" = "ssh-argv0" ] | ||
27 | then | ||
28 | echo 'ssh-argv0: This script should not be run like this, see ssh-argv0(1) for details' 1>&2 | ||
29 | exit 1 | ||
30 | fi | ||
31 | exec ssh "${0##*/}" "$@" | ||
diff --git a/debian/ssh-argv0.1 b/debian/ssh-argv0.1 new file mode 100644 index 000000000..a36a63d40 --- /dev/null +++ b/debian/ssh-argv0.1 | |||
@@ -0,0 +1,64 @@ | |||
1 | .Dd September 7, 2001 | ||
2 | .Dt SSH-ARGV0 1 | ||
3 | .Os Debian Project | ||
4 | .Sh NAME | ||
5 | .Nm ssh-argv0 | ||
6 | .Nd replaces the old ssh command-name as hostname handling | ||
7 | .Sh SYNOPSIS | ||
8 | .Ar hostname | user@hostname | ||
9 | .Op Fl l Ar login_name | ||
10 | .Op Ar command | ||
11 | .Pp | ||
12 | .Ar hostname | user@hostname | ||
13 | .Op Fl afgknqstvxACNTX1246 | ||
14 | .Op Fl b Ar bind_address | ||
15 | .Op Fl c Ar cipher_spec | ||
16 | .Op Fl e Ar escape_char | ||
17 | .Op Fl i Ar identity_file | ||
18 | .Op Fl l Ar login_name | ||
19 | .Op Fl m Ar mac_spec | ||
20 | .Op Fl o Ar option | ||
21 | .Op Fl p Ar port | ||
22 | .Op Fl F Ar configfile | ||
23 | .Oo Fl L Xo | ||
24 | .Sm off | ||
25 | .Ar port : | ||
26 | .Ar host : | ||
27 | .Ar hostport | ||
28 | .Sm on | ||
29 | .Xc | ||
30 | .Oc | ||
31 | .Oo Fl R Xo | ||
32 | .Sm off | ||
33 | .Ar port : | ||
34 | .Ar host : | ||
35 | .Ar hostport | ||
36 | .Sm on | ||
37 | .Xc | ||
38 | .Oc | ||
39 | .Op Fl D Ar port | ||
40 | .Op Ar command | ||
41 | .Sh DESCRIPTION | ||
42 | .Nm | ||
43 | replaces the old ssh command-name as hostname handling. | ||
44 | If you link to this script with a hostname then executing the link is | ||
45 | equivalent to having executed ssh with that hostname as an argument. | ||
46 | All other arguments are passed to ssh and will be processed normally. | ||
47 | .Sh OPTIONS | ||
48 | See | ||
49 | .Xr ssh 1 . | ||
50 | .Sh FILES | ||
51 | See | ||
52 | .Xr ssh 1 . | ||
53 | .Sh AUTHORS | ||
54 | OpenSSH is a derivative of the original and free | ||
55 | ssh 1.2.12 release by Tatu Ylonen. | ||
56 | Aaron Campbell, Bob Beck, Markus Friedl, Niels Provos, | ||
57 | Theo de Raadt and Dug Song | ||
58 | removed many bugs, re-added newer features and | ||
59 | created OpenSSH. | ||
60 | Markus Friedl contributed the support for SSH | ||
61 | protocol versions 1.5 and 2.0. | ||
62 | Jonathan Amery wrote this ssh-argv0 script and the associated documentation. | ||
63 | .Sh SEE ALSO | ||
64 | .Xr ssh 1 | ||
diff --git a/debian/ssh-askpass-gnome.copyright b/debian/ssh-askpass-gnome.copyright new file mode 100644 index 000000000..4a71dda00 --- /dev/null +++ b/debian/ssh-askpass-gnome.copyright | |||
@@ -0,0 +1,44 @@ | |||
1 | This package contains a Gnome based implementation of ssh-askpass | ||
2 | written by Damien Miller. | ||
3 | |||
4 | It is split out from the main package to isolate the dependency on the | ||
5 | Gnome and X11 libraries. | ||
6 | |||
7 | It was packaged for Debian by Philip Hands <phil@hands.com>. | ||
8 | |||
9 | Copyright: | ||
10 | |||
11 | /* | ||
12 | ** | ||
13 | ** GNOME ssh passphrase requestor | ||
14 | ** | ||
15 | ** Damien Miller <djm@ibs.com.au> | ||
16 | ** | ||
17 | ** Copyright 1999 Internet Business Solutions | ||
18 | ** | ||
19 | ** Permission is hereby granted, free of charge, to any person | ||
20 | ** obtaining a copy of this software and associated documentation | ||
21 | ** files (the "Software"), to deal in the Software without | ||
22 | ** restriction, including without limitation the rights to use, copy, | ||
23 | ** modify, merge, publish, distribute, sublicense, and/or sell copies | ||
24 | ** of the Software, and to permit persons to whom the Software is | ||
25 | ** furnished to do so, subject to the following conditions: | ||
26 | ** | ||
27 | ** The above copyright notice and this permission notice shall be | ||
28 | ** included in all copies or substantial portions of the Software. | ||
29 | ** | ||
30 | ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY | ||
31 | ** KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE | ||
32 | ** WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE | ||
33 | ** AND NONINFRINGEMENT. IN NO EVENT SHALL DAMIEN MILLER OR INTERNET | ||
34 | ** BUSINESS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
35 | ** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
36 | ** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE | ||
37 | ** OR OTHER DEALINGS IN THE SOFTWARE. | ||
38 | ** | ||
39 | ** Except as contained in this notice, the name of Internet Business | ||
40 | ** Solutions shall not be used in advertising or otherwise to promote | ||
41 | ** the sale, use or other dealings in this Software without prior | ||
42 | ** written authorization from Internet Business Solutions. | ||
43 | ** | ||
44 | */ | ||
diff --git a/debian/ssh-askpass-gnome.desktop b/debian/ssh-askpass-gnome.desktop new file mode 100644 index 000000000..eba7a67d1 --- /dev/null +++ b/debian/ssh-askpass-gnome.desktop | |||
@@ -0,0 +1,12 @@ | |||
1 | [Desktop Entry] | ||
2 | Version=1.0 | ||
3 | Encoding=UTF-8 | ||
4 | Name=SSH AskPass | ||
5 | GenericName=ssh-add | ||
6 | Comment=Enter passphrase to authenticate to the ssh agent | ||
7 | Exec=/usr/bin/ssh-add | ||
8 | TryExec=ssh-add | ||
9 | Terminal=false | ||
10 | Type=Application | ||
11 | Icon=ssh-askpass-gnome | ||
12 | Categories=Network;Security; | ||
diff --git a/debian/ssh-askpass-gnome.dirs b/debian/ssh-askpass-gnome.dirs new file mode 100644 index 000000000..0ffa45024 --- /dev/null +++ b/debian/ssh-askpass-gnome.dirs | |||
@@ -0,0 +1,3 @@ | |||
1 | usr/lib/openssh | ||
2 | usr/share/man/man1 | ||
3 | usr/share/pixmaps | ||
diff --git a/debian/ssh-askpass-gnome.examples b/debian/ssh-askpass-gnome.examples new file mode 100644 index 000000000..66fd8c0e4 --- /dev/null +++ b/debian/ssh-askpass-gnome.examples | |||
@@ -0,0 +1 @@ | |||
debian/ssh-askpass-gnome.desktop | |||
diff --git a/debian/ssh-askpass-gnome.install b/debian/ssh-askpass-gnome.install new file mode 100644 index 000000000..8b6b5f045 --- /dev/null +++ b/debian/ssh-askpass-gnome.install | |||
@@ -0,0 +1 @@ | |||
debian/ssh-askpass-gnome.png usr/share/pixmaps | |||
diff --git a/debian/ssh-askpass-gnome.manpages b/debian/ssh-askpass-gnome.manpages new file mode 100644 index 000000000..7749f13bb --- /dev/null +++ b/debian/ssh-askpass-gnome.manpages | |||
@@ -0,0 +1 @@ | |||
debian/gnome-ssh-askpass.1 | |||
diff --git a/debian/ssh-askpass-gnome.png b/debian/ssh-askpass-gnome.png new file mode 100644 index 000000000..06f75764e --- /dev/null +++ b/debian/ssh-askpass-gnome.png | |||
Binary files differ | |||
diff --git a/debian/ssh-askpass-gnome.postinst b/debian/ssh-askpass-gnome.postinst new file mode 100644 index 000000000..8a454e520 --- /dev/null +++ b/debian/ssh-askpass-gnome.postinst | |||
@@ -0,0 +1,48 @@ | |||
1 | #! /bin/sh | ||
2 | # postinst script for ssh-askpass-gnome | ||
3 | # | ||
4 | # see: dh_installdeb(1) | ||
5 | |||
6 | set -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 | |||
25 | case "$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 | ;; | ||
41 | esac | ||
42 | |||
43 | # dh_installdeb will replace this with shell code automatically | ||
44 | # generated by other debhelper scripts. | ||
45 | |||
46 | #DEBHELPER# | ||
47 | |||
48 | exit 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 | |||
6 | set -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 | |||
18 | case "$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 | ;; | ||
30 | esac | ||
31 | |||
32 | # dh_installdeb will replace this with shell code automatically | ||
33 | # generated by other debhelper scripts. | ||
34 | |||
35 | #DEBHELPER# | ||
36 | |||
37 | exit 0 | ||
38 | |||
39 | |||
diff --git a/debian/ssh-krb5.NEWS b/debian/ssh-krb5.NEWS new file mode 100644 index 000000000..5a6433ab2 --- /dev/null +++ b/debian/ssh-krb5.NEWS | |||
@@ -0,0 +1,18 @@ | |||
1 | ssh-krb5 (1:4.3p2-7) unstable; urgency=low | ||
2 | |||
3 | The normal openssh-server and openssh-client packages in Debian now | ||
4 | include full GSSAPI support, including key exchange. This package is | ||
5 | now only a transitional package that depends on openssh-server and | ||
6 | openssh-client and configures openssh-server for GSSAPI authentication | ||
7 | if it wasn't already. | ||
8 | |||
9 | You can now simply install openssh-server and openssh-client directly | ||
10 | and remove this package. Just make sure that /etc/ssh/sshd_config | ||
11 | contains: | ||
12 | |||
13 | GSSAPIAuthentication yes | ||
14 | GSSAPIKeyExchange yes | ||
15 | |||
16 | if you want to support GSSAPI authentication to your ssh server. | ||
17 | |||
18 | -- Russ Allbery <rra@debian.org> Tue, 03 Oct 2006 22:27:27 -0700 | ||
diff --git a/debian/ssh-krb5.postinst b/debian/ssh-krb5.postinst new file mode 100644 index 000000000..f799accfe --- /dev/null +++ b/debian/ssh-krb5.postinst | |||
@@ -0,0 +1,61 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | set -e | ||
4 | |||
5 | action="$1" | ||
6 | oldversion="$2" | ||
7 | |||
8 | if [ "$action" = configure ] ; then | ||
9 | # Make sure that GSSAPI is enabled. If there is no uncommented GSSAPI | ||
10 | # configuration, uncomment any commented-out configuration if present | ||
11 | # (this will catch the case of a fresh install of openssh-server). | ||
12 | # Otherwise, add configuration turning on GSSAPIAuthentication and | ||
13 | # GSSAPIKeyExchange. | ||
14 | # | ||
15 | # If there is some configuration, we may be upgrading from ssh-krb5. It | ||
16 | # enabled GSSAPIKeyExchange without any configuration option. Therefore, | ||
17 | # if it isn't explicitly set, always enable it for compatible behavior | ||
18 | # with ssh-krb5. | ||
19 | if dpkg --compare-versions "$oldversion" ge 1:4.3p2-9; then | ||
20 | : | ||
21 | else | ||
22 | changed= | ||
23 | if grep -qi '^[ ]*GSSAPI' /etc/ssh/sshd_config ; then | ||
24 | if grep -qi '^[ ]*GSSAPIKeyExchange' /etc/ssh/sshd_config ; then | ||
25 | : | ||
26 | else | ||
27 | changed=true | ||
28 | cat >> /etc/ssh/sshd_config <<EOF | ||
29 | |||
30 | # GSSAPI key exchange (added by ssh-krb5 transitional package) | ||
31 | GSSAPIKeyExchange yes | ||
32 | EOF | ||
33 | fi | ||
34 | else | ||
35 | changed=true | ||
36 | if grep -qi '^#GSSAPI' /etc/ssh/sshd_config ; then | ||
37 | perl -pe 's/^\#(GSSAPI(Authentication|KeyExchange))\b.*/$1 yes/i' \ | ||
38 | < /etc/ssh/sshd_config > /etc/ssh/sshd_config.dpkg-new | ||
39 | chown --reference /etc/ssh/sshd_config \ | ||
40 | /etc/ssh/sshd_config.dpkg-new | ||
41 | chmod --reference /etc/ssh/sshd_config \ | ||
42 | /etc/ssh/sshd_config.dpkg-new | ||
43 | mv /etc/ssh/sshd_config.dpkg-new /etc/ssh/sshd_config | ||
44 | else | ||
45 | cat >> /etc/ssh/sshd_config <<EOF | ||
46 | |||
47 | # GSSAPI authentication (added by ssh-krb5 transitional package) | ||
48 | GSSAPIAuthentication yes | ||
49 | GSSAPIKeyExchange yes | ||
50 | EOF | ||
51 | fi | ||
52 | fi | ||
53 | if [ -n "$changed" ]; then | ||
54 | invoke-rc.d ssh restart | ||
55 | fi | ||
56 | fi | ||
57 | fi | ||
58 | |||
59 | #DEBHELPER# | ||
60 | |||
61 | exit 0 | ||
diff --git a/debian/ssh.lintian-overrides b/debian/ssh.lintian-overrides new file mode 100644 index 000000000..b9bf7ea08 --- /dev/null +++ b/debian/ssh.lintian-overrides | |||
@@ -0,0 +1 @@ | |||
ssh: package-contains-empty-directory usr/share/doc/openssh-client/ | |||
diff --git a/debian/systemd/ssh.service b/debian/systemd/ssh.service new file mode 100644 index 000000000..6f69923f1 --- /dev/null +++ b/debian/systemd/ssh.service | |||
@@ -0,0 +1,15 @@ | |||
1 | [Unit] | ||
2 | Description=OpenBSD Secure Shell server | ||
3 | After=network.target auditd.service | ||
4 | ConditionPathExists=!/etc/ssh/sshd_not_to_be_run | ||
5 | |||
6 | [Service] | ||
7 | EnvironmentFile=-/etc/default/ssh | ||
8 | ExecStartPre=/usr/bin/test -c /dev/null | ||
9 | ExecStart=/usr/sbin/sshd -D $SSHD_OPTS | ||
10 | ExecReload=/bin/kill -HUP $MAINPID | ||
11 | KillMode=process | ||
12 | Restart=on-failure | ||
13 | |||
14 | [Install] | ||
15 | WantedBy=multi-user.target | ||
diff --git a/debian/systemd/ssh.socket b/debian/systemd/ssh.socket new file mode 100644 index 000000000..fa1f615e4 --- /dev/null +++ b/debian/systemd/ssh.socket | |||
@@ -0,0 +1,11 @@ | |||
1 | [Unit] | ||
2 | Description=OpenBSD Secure Shell server socket | ||
3 | Conflicts=ssh.service | ||
4 | ConditionPathExists=!/etc/ssh/sshd_not_to_be_run | ||
5 | |||
6 | [Socket] | ||
7 | ListenStream=22 | ||
8 | Accept=yes | ||
9 | |||
10 | [Install] | ||
11 | WantedBy=sockets.target | ||
diff --git a/debian/systemd/ssh@.service b/debian/systemd/ssh@.service new file mode 100644 index 000000000..c2f9b1547 --- /dev/null +++ b/debian/systemd/ssh@.service | |||
@@ -0,0 +1,9 @@ | |||
1 | [Unit] | ||
2 | Description=OpenBSD Secure Shell server per-connection daemon | ||
3 | After=auditd.service | ||
4 | |||
5 | [Service] | ||
6 | EnvironmentFile=-/etc/default/ssh | ||
7 | ExecStartPre=/usr/bin/test -c /dev/null | ||
8 | ExecStart=-/usr/sbin/sshd -i $SSHD_OPTS | ||
9 | StandardInput=socket | ||
diff --git a/debian/systemd/sshd.conf b/debian/systemd/sshd.conf new file mode 100644 index 000000000..ab7302189 --- /dev/null +++ b/debian/systemd/sshd.conf | |||
@@ -0,0 +1 @@ | |||
d /var/run/sshd 0755 root root | |||
diff --git a/debian/tests/Makefile b/debian/tests/Makefile new file mode 100644 index 000000000..666ed8227 --- /dev/null +++ b/debian/tests/Makefile | |||
@@ -0,0 +1,12 @@ | |||
1 | test: getpid.so | ||
2 | chmod +x keygen-test | ||
3 | ./keygen-test | ||
4 | |||
5 | getpid.o: getpid.c | ||
6 | gcc -fPIC -c $< -o $@ | ||
7 | |||
8 | getpid.so: getpid.o | ||
9 | gcc -shared -o $@ $< | ||
10 | |||
11 | clean: | ||
12 | rm -f getpid.o getpid.so key1 key1.pub key2 key2.pub | ||
diff --git a/debian/tests/getpid.c b/debian/tests/getpid.c new file mode 100644 index 000000000..c9e35b87e --- /dev/null +++ b/debian/tests/getpid.c | |||
@@ -0,0 +1,39 @@ | |||
1 | /* | ||
2 | * Compile: | ||
3 | |||
4 | gcc -fPIC -c getpid.c -o getpid.o | ||
5 | gcc -shared -o getpid.so getpid.o | ||
6 | |||
7 | * Use: | ||
8 | |||
9 | FORCE_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 | |||
36 | pid_t getpid(void) | ||
37 | { | ||
38 | return atoi(getenv("FORCE_PID")); | ||
39 | } | ||
diff --git a/debian/tests/keygen-test b/debian/tests/keygen-test new file mode 100755 index 000000000..02b7c761a --- /dev/null +++ b/debian/tests/keygen-test | |||
@@ -0,0 +1,12 @@ | |||
1 | #! /bin/sh | ||
2 | |||
3 | rm -f key1 key1.pub key2 key2.pub | ||
4 | LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \ | ||
5 | ../../build-deb/ssh-keygen -N '' -f key1 >/dev/null | ||
6 | LD_PRELOAD="$(pwd)/getpid.so" FORCE_PID=1234 \ | ||
7 | ../../build-deb/ssh-keygen -N '' -f key2 >/dev/null | ||
8 | if cmp -s key1 key2; then | ||
9 | echo "Generated two identical keys!" >&2 | ||
10 | exit 1 | ||
11 | fi | ||
12 | exit 0 | ||
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 000000000..ac41e6e22 --- /dev/null +++ b/debian/upstream/signing-key.asc | |||
@@ -0,0 +1,44 @@ | |||
1 | -----BEGIN PGP PUBLIC KEY BLOCK----- | ||
2 | Version: GnuPG v1 | ||
3 | |||
4 | mQGdBFKmggUBDICUNqm4cNh7tdEbwaNhbnwqLiHpILeXT6sddGI0Stz5ofB1uvIH | ||
5 | m9kXYG5XUUwlc5ywjIZm2JeuKqrd/6wAz5laLagFA6k86EZzzuBE3b5FxSQ4EN4K | ||
6 | 5XZEJo61xASEF7z1mQCiqoA6/F407ht7nNoiVE95kOmqJlv4cqbpCw3n8f2VW+mV | ||
7 | UH6MYRZVrYAC9NnJWv24rem2fjgFhNT1/bx44G7H9bVJqL7hMEGa+xYQBI3YT/ul | ||
8 | Eu9HYmLFVeiZm1gB1eKXW7jS4ctLl5uPrxayA5DX/qNB2yqgVVlIKFwUm8gGPGPO | ||
9 | nsNKo0xBseE7E0F/KeGpaT5aS9yFgPm9A652Jx9felYgb0e9Ipt3lxriPQwgF/cx | ||
10 | LGuP/WEbN5fpWFnuV0ViklusuVI2e8GHJGU5bQD5AlzvWu4Sv6oBOcDCabScydY7 | ||
11 | IxPBk/XBWCF9QDIa2qa32Mc9dYc8EnJszPeVCHX5hG23omDRmdLGLwH7F+CuBvCx | ||
12 | AKCymZtJl5DhRmnhdzRg9d+0VG4hLF7O06ANABEBAAG0H0RhbWllbiBNaWxsZXIg | ||
13 | PGRqbUBtaW5kcm90Lm9yZz6JAc0EEwECACcCGwMFCQ1H67ECHgECF4AFAlKmjJwE | ||
14 | CwkIBwYVCgkICwIFFgIDAQAACgkQ0+X1a22SDTB2TAx9E1ozPJKUGWJPZefqsSr8 | ||
15 | KsO6Dp3QuPrw2Zwgo2QfeCT+uzNA5AKCDIAaYEpVbQsvu4sDy8dAW1+HENCxVrMX | ||
16 | WG+SH41lcdAdI4io0PGHVQDl42R5jX3e9pfjYCQALVv5BDXddK6054nyxEmudQ3I | ||
17 | CFCYXIcqQbA1nfj3Uk06jGhuM99B2/akbxCoFSiUX9uHDZKNYAGpU7/FCF9xCZF4 | ||
18 | Kd9Twvyy17jDIg7km3/Q4Jy++VP8FyvE5JjBdLRQSBzSG9GCjv9fyKWW7S0bMY4D | ||
19 | 3SKKt/Jm1XchEMgpRr4eBpgCs3rxO1hXjzqm3te97uy6/q8CuJUtupJsPKc9Wh4+ | ||
20 | ogUZifC0ta7UrxZp8yZTRvPSUxYrlvDzM32VDLQ3FX6Y2i4VNo48PSJMA+BPUx7D | ||
21 | TcZKIXt457zsLD4jF4sRdwOk/QF/GXCkH2GAyKHWCPXIOe+jIXgiuajcqZm9cAWj | ||
22 | L3hidSohKfefvKkzsg75mDmjhvAtDncIbmImJNjXIe2PQU4iY9Vq5i0vlaVKgBgK | ||
23 | SohGBBARAgAGBQJSpovfAAoJEM6OywOG/5xInf8An0A7MPrfJIz2e643VEV4AX3d | ||
24 | O9+IAJ9MOsQiB4LnqtTcc9NBMHf9VLE46LkBnQRSpoIFAQyA1OdwfpwXKch+O00W | ||
25 | 1FsQSMcEjahGmo84WTroM/qjTd7Ysld300PMv3wkQn2WdhyTca/EmkW0fVTGSYs7 | ||
26 | Z3v5SpPf0prYSjmfu8WlXoz64ApdXqGHjj9KAeq2OuUtWrwobgiQEzU4Hxlz94X/ | ||
27 | 65BgG5k7OTyE3J6bgRcMwJCgCkwjK85wbbBkGH+Jo9o/Zw9TPczQcE7BmGYkkLNA | ||
28 | Xbw7omKBOL4Z6w9sXToz9UnQ0EB9s4TvAbHGKX9y2PEQjZN+wkzR3DavWB7ql8vH | ||
29 | ZIRmspAsDAJvDT1ofsNtu8MB8wJcxvZaoZ7j9wULYpnaNYx9xxEhgbB9o1mBcYsd | ||
30 | Dj3xz5jrgtq/cpdgGC6bg+awDc/ylQ1mNglKfY8P9hFIhIANZilnmAlk5GSoWclP | ||
31 | /69m+u34KKoHU4Yc3I1pPNcL6Nyi0bh8mHqe9WedKfod7Y4yM1S20fXaS4vrLIlK | ||
32 | gxbsDpWiWrk0ltV03uyC7eqDe3nzzGW/2GLTHj5xsA2+HwGtPom5mmzjvV5PFNpS | ||
33 | 7a90JQARAQABiQG1BBgBAgAPBQJSpoIFAhsMBQkNR+uxAAoJENPl9Wttkg0wEScM | ||
34 | f2QjDWm3XawJxNA8pqqxrFeTEo+GESznVRTUeprrUFd1GHw33qaAvqLixZ+x8cr+ | ||
35 | 1Gj/fJd5eiIVJfRLYbXlC8su8JZXngfX0VhuMcUob/FTikfpcoYkRzriUsJEB3/O | ||
36 | mjlLjGgnQm5Gz9TV1ityF3bzoHkR8svWEKKKzNoIEPHLU3y7bqSkOrjnY3bZfdVR | ||
37 | h618XbjV28NMuoZsV8E4pOuQoy+3s5IjmIf/mkSiFE3VJwdaPem23UsXatFb/eoC | ||
38 | /Ahi0iCd/8ioFwi+oHT2Pnt9HrzVF6E8gBVO3vKo6UJgDTr9Qt27Nc6eHL0O5j50 | ||
39 | ins9ob/3DoOC3P5A08zhl+w466yGEv5+Es/usUAs/4ng4ksI3DTLK9Ygj70l5oBu | ||
40 | MFYd3b5KGVfAIlGc5mwIOIG41YLIzZTrGuOuTymjwCdC9cUZJ6R2Cv/Vx0htZ0hq | ||
41 | DdyaDO0Io9OG/W2s2T7160tY9ic4MwBCFemzwFELIBIIHNY/n/wsmxQGkI3Oj86J | ||
42 | pOVVgR5lXWR+BrGcBjkSEyg= | ||
43 | =T9xO | ||
44 | -----END PGP PUBLIC KEY BLOCK----- | ||
diff --git a/debian/watch b/debian/watch new file mode 100644 index 000000000..426797246 --- /dev/null +++ b/debian/watch | |||
@@ -0,0 +1,3 @@ | |||
1 | version=3 | ||
2 | opts=pgpsigurlmangle=s/$/.asc/ \ | ||
3 | ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-(.*)\.tar\.gz | ||