summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2010-04-28 22:09:13 +0100
committerColin Watson <cjwatson@debian.org>2010-04-28 22:09:13 +0100
commitfcece9746ba57dc1a03a5be0367f3f0f2f219f02 (patch)
treecd10c09ea3a468b297a00d5104d5a56a918c1f25
parent0d721c63cd02fc75df8579f76344ed63dd27b5f3 (diff)
Drop IDEA key check; I don't think it works properly any more due to
textual changes in error output, it's only relevant for direct upgrades from truly ancient versions, and it breaks upgrades if /etc/ssh/ssh_host_key can't be loaded (closes: #579570).
-rw-r--r--debian/changelog4
-rw-r--r--debian/openssh-server.postinst15
2 files changed, 4 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog
index ec6547a36..ba4da7c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ openssh (1:5.5p1-3) UNRELEASED; urgency=low
2 2
3 * Discard error messages while checking whether rsh, rlogin, and rcp 3 * Discard error messages while checking whether rsh, rlogin, and rcp
4 alternatives exist (closes: #579285). 4 alternatives exist (closes: #579285).
5 * Drop IDEA key check; I don't think it works properly any more due to
6 textual changes in error output, it's only relevant for direct upgrades
7 from truly ancient versions, and it breaks upgrades if
8 /etc/ssh/ssh_host_key can't be loaded (closes: #579570).
5 9
6 -- Colin Watson <cjwatson@debian.org> Mon, 26 Apr 2010 23:37:41 +0100 10 -- Colin Watson <cjwatson@debian.org> Mon, 26 Apr 2010 23:37:41 +0100
7 11
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index d415f3f0d..325af4ef4 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -22,20 +22,6 @@ fix_doc_symlink() {
22 fi 22 fi
23} 23}
24 24
25check_idea_key() {
26 # check for old host_key files using IDEA, which openssh does not
27 # support
28 if [ -f /etc/ssh/ssh_host_key ] ; then
29 cp -a /etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.check_idea
30 if ssh-keygen -p -N '' -f /etc/ssh/ssh_host_key.check_idea 2>&1 | \
31 grep -q 'unknown cipher' 2>/dev/null; then
32 mv /etc/ssh/ssh_host_key /etc/ssh/ssh_host_key.old
33 mv /etc/ssh/ssh_host_key.pub /etc/ssh/ssh_host_key.pub.old
34 fi
35 rm -f /etc/ssh/ssh_host_key.check_idea
36 fi
37}
38
39 25
40get_config_option() { 26get_config_option() {
41 option="$1" 27 option="$1"
@@ -465,7 +451,6 @@ commit_mv_conffile () {
465 451
466fix_doc_symlink 452fix_doc_symlink
467create_sshdconfig 453create_sshdconfig
468check_idea_key
469create_keys 454create_keys
470vulnerable_host_keys 455vulnerable_host_keys
471fix_statoverride 456fix_statoverride