summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorEivind Uggedal <eivind@uggedal.com>2014-04-04 11:41:08 +0000
committerTimo Teräs <timo.teras@iki.fi>2014-04-04 14:57:40 +0300
commit382576cb87dd9f51f7fad493f7e8739547685d35 (patch)
tree3080bda99501c4c9b78ae57d73d295b0d929f007 /main
parentb6c8cae60efa87d55b5580368eed6d9f169543d0 (diff)
downloadaports-382576cb87dd9f51f7fad493f7e8739547685d35.tar.bz2
aports-382576cb87dd9f51f7fad493f7e8739547685d35.tar.xz
main/openssh: generate ed25519 host key
Diffstat (limited to 'main')
-rw-r--r--main/openssh/APKBUILD8
-rwxr-xr-xmain/openssh/sshd.initd2
2 files changed, 5 insertions, 5 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index 122933dea..e58053d3b 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openssh
pkgver=6.6_p1
_myver=${pkgver%_*}${pkgver#*_}
-pkgrel=0
+pkgrel=1
pkgdesc="Port of OpenBSD's free SSH release"
url="http://www.openssh.org/portable.html"
arch="all"
@@ -106,7 +106,7 @@ md5sums="3e9800e6bca1fbac0eea4d41baa7f239 openssh-6.6p1.tar.gz
cd52fe99cb4b7d0d847bf5d710d93564 openssh6.5-peaktput.diff
7c86680602f7ad71b0773d9e98a30d73 openssh-fix-includes.diff
f7d9d6f96940ef66bd3c3a0aa27e57a7 openssh-fix-utmp.diff
-cb0dd08c413fad346f0c594107b4a2e0 sshd.initd
+bcf990d4ef7ff446160cde7dbd32bf1f sshd.initd
b35e9f3829f4cfca07168fcba98749c7 sshd.confd
e4cf579145106ce3d4465453b70ea50d CVE-2014-2532.patch"
sha256sums="48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb openssh-6.6p1.tar.gz
@@ -114,7 +114,7 @@ sha256sums="48c1f0664b4534875038004cc4f3555b8329c2a81c1df48db5c517800de203bb op
bf49212e47a86d10650f739532cea514a310925e6445b4f8011031b6b55f3249 openssh6.5-peaktput.diff
c3189ba0e17e60e83851ac2d6f18ad5b08cb90cccfce31d61cccb9fd76d44d59 openssh-fix-includes.diff
f2748da45d0bc31055727f8c80d93e1872cc043ced3202e2f6d150aca3c08dde openssh-fix-utmp.diff
-3fa062fd4bfac64abf21f3c1d0548f1dfcf3c6e56e84ece14c848f53a293024e sshd.initd
+2a9889ab224be7202ece80a7085aa3e85bbba9432467031b436dcd77cb92a2ac sshd.initd
29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 sshd.confd
323d1a7a0ff72143580ac1b0ce2a28b9640f956368bc6629890c22c79af28aaa CVE-2014-2532.patch"
sha512sums="3d3566ed87649882702cad52db1adefebfb3ef788c9f77a493f99db7e9ca2e8edcde793dd426df7df0aed72a42a31c20a63ef51506111369d3a7c49e0bf6c82b openssh-6.6p1.tar.gz
@@ -122,6 +122,6 @@ sha512sums="3d3566ed87649882702cad52db1adefebfb3ef788c9f77a493f99db7e9ca2e8edcde
e041398e177674f698480e23be037160bd07b751c754956a3ddf1b964da24c85e826fb75e7c23c9826d36761da73d08db9583c047d58a08dc7b2149a949075b1 openssh6.5-peaktput.diff
70e2c6613ab77ec379e03ddf029c1c38e5d852bb225db40ceaa63e642d58b0261fa7c954b288710736bb1dc71f8057f2598ea0d1f5b1214135fa5e9541d5f05a openssh-fix-includes.diff
cc909f68d9da1b264926973b96d36162b5c588299c98d62f526faf2ef1273d98bb8d8dea4d482770a2aef88bcbf15fa61144401aef9ab916c15e1623bcf449b5 openssh-fix-utmp.diff
-1483e2bcd700da9b02f04508d490b472c816344787bf1675fef2f7e27f72b91e4323e4e8c1db701e47d81d37d6d4b0623eaeac46b2cf589ae5ad69f363baa594 sshd.initd
+eeafefcb8a3357b498591480b39dc0116ab3440c88faeaeaddeac0b860f9e268abe6f603bc27893b79945acde06a45a7616d1bdc6ca27201cd8dc522f49b207e sshd.initd
b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81 sshd.confd
4521052ef55b77a2932484fa52f4a7688e8dbd4e6aa1e210ce24a59b8501775ca7e844108e36c06a9e3a47b70cd8d59007c12ca7a7bb8af27ae1e31e7b0de34d CVE-2014-2532.patch"
diff --git a/main/openssh/sshd.initd b/main/openssh/sshd.initd
index 193985b09..937b60d7d 100755
--- a/main/openssh/sshd.initd
+++ b/main/openssh/sshd.initd
@@ -52,7 +52,7 @@ gen_keys() {
if egrep -q '^[[:space:]]*Protocol[[:space:]]+.*1' "${SSHD_CONFDIR}"/sshd_config ; then
gen_key rsa1 "" || return 1
fi
- gen_key dsa && gen_key rsa && gen_key ecdsa
+ gen_key dsa && gen_key rsa && gen_key ecdsa && gen_key ed25519
return $?
}