diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-08 11:26:21 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-08 11:26:21 +0000 |
commit | dd79498e0f4086a765cea7757ac023e925b75db2 (patch) | |
tree | aecf8e47f7abe06e86f961eb6fb198c1ca7b5de8 /debian/patches/ssh-vulnkey.patch | |
parent | dbf5ed52ce596dcf8c1f151d587f7f1f4c78b4eb (diff) |
Drop compatibility with the old gssapi mechanism used in ssh-krb5 <<
3.8.1p1-1. Simon Wilkinson refused this patch since the old gssapi
mechanism was removed due to a serious security hole, and since these
versions of ssh-krb5 are no longer security-supported by Debian I don't
think there's any point keeping client compatibility for them.
Diffstat (limited to 'debian/patches/ssh-vulnkey.patch')
-rw-r--r-- | debian/patches/ssh-vulnkey.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/ssh-vulnkey.patch b/debian/patches/ssh-vulnkey.patch index c1df3b7f4..a0396a6eb 100644 --- a/debian/patches/ssh-vulnkey.patch +++ b/debian/patches/ssh-vulnkey.patch | |||
@@ -1315,7 +1315,7 @@ Index: b/sshconnect2.c | |||
1315 | =================================================================== | 1315 | =================================================================== |
1316 | --- a/sshconnect2.c | 1316 | --- a/sshconnect2.c |
1317 | +++ b/sshconnect2.c | 1317 | +++ b/sshconnect2.c |
1318 | @@ -1418,6 +1418,8 @@ | 1318 | @@ -1392,6 +1392,8 @@ |
1319 | 1319 | ||
1320 | /* list of keys stored in the filesystem */ | 1320 | /* list of keys stored in the filesystem */ |
1321 | for (i = 0; i < options.num_identity_files; i++) { | 1321 | for (i = 0; i < options.num_identity_files; i++) { |
@@ -1324,7 +1324,7 @@ Index: b/sshconnect2.c | |||
1324 | key = options.identity_keys[i]; | 1324 | key = options.identity_keys[i]; |
1325 | if (key && key->type == KEY_RSA1) | 1325 | if (key && key->type == KEY_RSA1) |
1326 | continue; | 1326 | continue; |
1327 | @@ -1508,7 +1510,7 @@ | 1327 | @@ -1482,7 +1484,7 @@ |
1328 | if (id->key && id->key->type != KEY_RSA1) { | 1328 | if (id->key && id->key->type != KEY_RSA1) { |
1329 | debug("Offering public key: %s", id->filename); | 1329 | debug("Offering public key: %s", id->filename); |
1330 | sent = send_pubkey_test(authctxt, id); | 1330 | sent = send_pubkey_test(authctxt, id); |