diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-30 14:19:24 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-07-30 14:19:24 +0000 |
| commit | dcd01962e2f8f725ba879e17feb98988480f5500 (patch) | |
| tree | 0438ef74ed88860d6aa4a112632cb01a177fc000 /main/openssh | |
| parent | 5c4f00a1b2212fcd57d9d4c8df77019dbbcfe29b (diff) | |
| download | aports-dcd01962e2f8f725ba879e17feb98988480f5500.tar.bz2 aports-dcd01962e2f8f725ba879e17feb98988480f5500.tar.xz | |
main/openssh: security fix for CVE-2015-5600
ref #4473
Diffstat (limited to 'main/openssh')
| -rw-r--r-- | main/openssh/APKBUILD | 6 | ||||
| -rw-r--r-- | main/openssh/CVE-2015-5600.patch | 39 |
2 files changed, 44 insertions, 1 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index 21cc81c422..0d1af9e397 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -2,7 +2,7 @@ pkgname=openssh pkgver=6.9_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" @@ -12,6 +12,7 @@ depends="openssh-client" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-doc $pkgname-client $pkgname-keysign" source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz + CVE-2015-5600.patch openssh6.5-peaktput.diff openssh6.9-dynwindows.diff openssh-fix-utmp.diff @@ -107,6 +108,7 @@ keysign() { } md5sums="0b161c44fc31fbc6b76a6f8ae639f16f openssh-6.9p1.tar.gz +f3e17e9514d246d415fb6388609bc0f8 CVE-2015-5600.patch cd52fe99cb4b7d0d847bf5d710d93564 openssh6.5-peaktput.diff 3880d0b657ed1c58f8747c17e6be4483 openssh6.9-dynwindows.diff 37fbfe9cfb9a5e2454382ea8c79ed2e1 openssh-fix-utmp.diff @@ -114,6 +116,7 @@ e3fd4d42e2664b6c37f0c636f5e7a5d8 sshd.initd b35e9f3829f4cfca07168fcba98749c7 sshd.confd 2dd7e366607e95f9762273067309fd6e openssh-sftp-interactive.diff" sha256sums="6e074df538f357d440be6cf93dc581a21f22d39e236f217fcd8eacbb6c896cfe openssh-6.9p1.tar.gz +8ce7fa061a4d3a0ac94f07ac694551ac1c5c1e5f82daf04a6434b69761c2fb6e CVE-2015-5600.patch bf49212e47a86d10650f739532cea514a310925e6445b4f8011031b6b55f3249 openssh6.5-peaktput.diff 6340934b3178fda8ce9f70a2349389fcd2d17c156209f7d08ba38076bee73560 openssh6.9-dynwindows.diff 1c85437fd94aa4fc269e6297e4eb790baa98c39949ec0410792c09ee31ba9782 openssh-fix-utmp.diff @@ -121,6 +124,7 @@ cf053bee46c7037bdab3b3575c7080f4b514d8623c023a4dcfccb4cdcff179cf sshd.initd 29c6d57ac3ec6018cadc6ba6cd9b90c9ed46e20049b970fdcc68ee2481a2ee41 sshd.confd 4ce1ad5f767c0f4e854a0cfeef0e2e400f333c649e552df1ecc317e6a6557376 openssh-sftp-interactive.diff" sha512sums="68fec9b4e512fe126a5d35b01e2cc656d810b75052ed8a36bc85cd0a05de7318b15ed287bc95cf9bcb3fa2f385029151d85aced55e07fbcc79e6c779bee6751d openssh-6.9p1.tar.gz +30decd1e2f66e9a772389b190e3576722d554015c2ee2418b83bc77ed692c3e3d8ec0a8caf389b054c7db23571742d9eadd0017e8f95441759401867ceaf1fd1 CVE-2015-5600.patch e041398e177674f698480e23be037160bd07b751c754956a3ddf1b964da24c85e826fb75e7c23c9826d36761da73d08db9583c047d58a08dc7b2149a949075b1 openssh6.5-peaktput.diff b86f78d7de20c957f58a228a5a1385e6ccf9608c280630524cdbdd1300b04d8382fb86cf42852354f24f0a7d7132520a7c7edb4f2227ce70a99bec269ff33438 openssh6.9-dynwindows.diff f35fffcd26635249ce5d820e7b3e406e586f2d2d7f6a045f221e2f9fb53aebc1ab1dd1e603b3389462296ed77921a1d08456e7aaa3825cbed08f405b381a58e1 openssh-fix-utmp.diff diff --git a/main/openssh/CVE-2015-5600.patch b/main/openssh/CVE-2015-5600.patch new file mode 100644 index 0000000000..32014259ea --- /dev/null +++ b/main/openssh/CVE-2015-5600.patch @@ -0,0 +1,39 @@ +=================================================================== +RCS file: /cvs/src/usr.bin/ssh/auth2-chall.c,v +retrieving revision 1.42 +retrieving revision 1.43 +diff -u -r1.42 -r1.43 +--- a/auth2-chall.c 2015/01/19 20:07:45 1.42 ++++ b/auth2-chall.c 2015/07/18 07:57:14 1.43 +@@ -1,4 +1,4 @@ +-/* $OpenBSD: auth2-chall.c,v 1.42 2015/01/19 20:07:45 markus Exp $ */ ++/* $OpenBSD: auth2-chall.c,v 1.43 2015/07/18 07:57:14 djm Exp $ */ + /* + * Copyright (c) 2001 Markus Friedl. All rights reserved. + * Copyright (c) 2001 Per Allansson. All rights reserved. +@@ -57,6 +57,7 @@ + void *ctxt; + KbdintDevice *device; + u_int nreq; ++ u_int devices_done; + }; + + static KbdintAuthctxt * +@@ -123,11 +124,15 @@ + if (len == 0) + break; + for (i = 0; devices[i]; i++) { +- if (!auth2_method_allowed(authctxt, ++ if ((kbdintctxt->devices_done & (1 << i)) != 0 || ++ !auth2_method_allowed(authctxt, + "keyboard-interactive", devices[i]->name)) + continue; +- if (strncmp(kbdintctxt->devices, devices[i]->name, len) == 0) ++ if (strncmp(kbdintctxt->devices, devices[i]->name, ++ len) == 0) { + kbdintctxt->device = devices[i]; ++ kbdintctxt->devices_done |= 1 << i; ++ } + } + t = kbdintctxt->devices; + kbdintctxt->devices = t[len] ? xstrdup(t+len+1) : NULL; |