diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-10 14:54:04 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-01-10 14:55:12 +0000 |
commit | aec8070d40f61980210134fec4b6ef9ba937a5a7 (patch) | |
tree | ea9980df9f21620dcb492b61cd7dd4ea33838769 | |
parent | a9f1aa0785594722dbcebdf6b8c243a6c616a269 (diff) | |
download | alpine_aports-aec8070d40f61980210134fec4b6ef9ba937a5a7.tar.bz2 alpine_aports-aec8070d40f61980210134fec4b6ef9ba937a5a7.tar.xz alpine_aports-aec8070d40f61980210134fec4b6ef9ba937a5a7.zip |
main/heimdal: security fix (CVE-2011-4862)
fixes #913
(cherry picked from commit f81ee55cee797b4203340cebc3f15691ac93faeb)
-rw-r--r-- | main/heimdal/APKBUILD | 6 | ||||
-rw-r--r-- | main/heimdal/telnetd.patch | 14 |
2 files changed, 18 insertions, 2 deletions
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index 6fb47a1652..cd760c3f56 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD | |||
@@ -2,7 +2,7 @@ | |||
2 | # Contributor: Natanael Copa <ncopa@alpinelinux.org> | 2 | # Contributor: Natanael Copa <ncopa@alpinelinux.org> |
3 | pkgname=heimdal | 3 | pkgname=heimdal |
4 | pkgver=1.4 | 4 | pkgver=1.4 |
5 | pkgrel=9 | 5 | pkgrel=10 |
6 | pkgdesc="An implementation of Kerberos 5" | 6 | pkgdesc="An implementation of Kerberos 5" |
7 | arch="all" | 7 | arch="all" |
8 | url="http://www.h5l.org/" | 8 | url="http://www.h5l.org/" |
@@ -21,6 +21,7 @@ source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz | |||
21 | 005_all_heimdal-suid_fix.patch | 21 | 005_all_heimdal-suid_fix.patch |
22 | 014_all_heimdal-path.patch | 22 | 014_all_heimdal-path.patch |
23 | heimdal-1.4-make.patch | 23 | heimdal-1.4-make.patch |
24 | telnetd.patch | ||
24 | " | 25 | " |
25 | 26 | ||
26 | _builddir="$srcdir/$pkgname-$pkgver" | 27 | _builddir="$srcdir/$pkgname-$pkgver" |
@@ -172,4 +173,5 @@ md5sums="31d08bbf47a77827fe97ef3f52b4c9c4 heimdal-1.4.tar.gz | |||
172 | 2feec3924ee5230b54175b4d4000c872 003_all_heimdal-rxapps.patch | 173 | 2feec3924ee5230b54175b4d4000c872 003_all_heimdal-rxapps.patch |
173 | 45aeb207f360f9f4e9e0fabc8bfeecbc 005_all_heimdal-suid_fix.patch | 174 | 45aeb207f360f9f4e9e0fabc8bfeecbc 005_all_heimdal-suid_fix.patch |
174 | 8208ae8c0b6ff5ab4f64af1693e9e396 014_all_heimdal-path.patch | 175 | 8208ae8c0b6ff5ab4f64af1693e9e396 014_all_heimdal-path.patch |
175 | fa1753ec676029cd59a3ef24da55c144 heimdal-1.4-make.patch" | 176 | fa1753ec676029cd59a3ef24da55c144 heimdal-1.4-make.patch |
177 | f320b91692b872e28f446f9cf1bc68bf telnetd.patch" | ||
diff --git a/main/heimdal/telnetd.patch b/main/heimdal/telnetd.patch new file mode 100644 index 0000000000..9c4d10386c --- /dev/null +++ b/main/heimdal/telnetd.patch | |||
@@ -0,0 +1,14 @@ | |||
1 | Index: crypto/heimdal/appl/telnet/libtelnet/encrypt.c | ||
2 | =================================================================== | ||
3 | --- appl/telnet/libtelnet/encrypt.c (revision 228798) | ||
4 | +++ appl/telnet/libtelnet/encrypt.c (working copy) | ||
5 | @@ -736,6 +736,9 @@ | ||
6 | int dir = kp->dir; | ||
7 | int ret = 0; | ||
8 | |||
9 | + if (len > MAXKEYLEN) | ||
10 | + len = MAXKEYLEN; | ||
11 | + | ||
12 | if (!(ep = (*kp->getcrypt)(*kp->modep))) { | ||
13 | if (len == 0) | ||
14 | return; | ||