aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Shelton <stuart@shelton.me>2017-11-27 16:38:34 +0000
committerStuart Shelton <stuart@shelton.me>2017-11-27 16:38:34 +0000
commit52c4bf22dd5ac0696dd79b9a8bd17b1a6f4cea1f (patch)
tree5a2dfa76f409f8e512b8ad6e5bac5c9e75b7a223 /net-dns
parentUpdate file wireshark-99999999-androiddump.patch, affecting net-analyzer/wire... (diff)
downloadsrcshelton-52c4bf22dd5ac0696dd79b9a8bd17b1a6f4cea1f.tar.gz
srcshelton-52c4bf22dd5ac0696dd79b9a8bd17b1a6f4cea1f.tar.bz2
srcshelton-52c4bf22dd5ac0696dd79b9a8bd17b1a6f4cea1f.zip
Update file libidn-1.33-CVE-2017-14062.patch, affecting net-dns/libidn-1.33-r1
Diffstat (limited to 'net-dns')
-rw-r--r--net-dns/libidn/Manifest2
-rw-r--r--net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch45
2 files changed, 46 insertions, 1 deletions
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 3ebbd5ed..f4ade7c6 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,5 +1,5 @@
AUX 50libidn-gentoo.el 455 SHA256 b8b5a7df3ef312b47ef44d7b5c9180e06e9d8b9cbe43fa67b8511296381ff937 SHA512 13bcc7078ae8e088014323707d451c0bfdb53414e550945248a9648afa81681db013cb523eae71116c84f1dcfbb3b87e8743971775b75c4ce6dad914b3b0a501 WHIRLPOOL e2925be57973d4f2d9adebaa63bc9a2d63daa0c4ac571790fd564fe4b7a4d5d8db62a0e342a5043b28e2c506bb62f86e9f967e5a680dd50261fa1dfb4214b260
-AUX libidn-1.33-CVE-2017-14062.patch 938 SHA256 c640ebe93568bd2dc2cae2151fa91fb8f4d8190bf2bb3b353a638282ab44cef1 SHA512 a78a57fe5583cb02239fbff11d33b1ee1f84b91817c5376ed441173be5fa47337019b0b098a5134c19f1f62ab5efac0621dd8fc922ec09de21481b9905638f20 WHIRLPOOL e2c0dc34aee544d0a9a35c8afb7f79ed6f6bb5d81b5223b3cd85ee768a82e44eaee1c263137e853551fc059c60b89d479db3d3c73f5be3173701a3a4133cda06
+AUX libidn-1.33-CVE-2017-14062.patch 2348 SHA256 ed8fcd8a6f3a6a8feb7ffbccf27ae5800571e3706d2f1a3c3f1b8c27c89b5f1d SHA512 25e6ff17d2d6886fec51db7e9584bbb7aff9b717c23accf7c956611f1bf4c965cc5f51837367c410b7c8c29c58170e94e2e0146e9e2921b3a0c5bc411bcddfbb WHIRLPOOL 74f888cb46525a36ee1769b0ddc2486e5a2075cb58426b26b8b497f127376c99837b0270352e5d243a96be2557b51418e03df74aad37badcc4ee0b767dce3482
DIST libidn-1.33.tar.gz 3501056 SHA256 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6 WHIRLPOOL 3b0c44742c2515e09eaf8f16f32f30bc37478a6273765d71dd9a9283f501998b6d85583cd38810bbdbd6103855e77831360010d707d29956798e3f5d066b0e82
EBUILD libidn-1.33-r1.ebuild 3078 SHA256 eb9faa262cb69381dae411f627cca0e51f8a5be3ac6beb5fdf96f6337c0e025f SHA512 5119401d4199581e42ede44ab51471e928bc6ce8276630588a699a7b6c3aa795490f91d413321dcdfbd8ea5898f1c0ce4229ae8575cb0774900a4ee9e985b9e3 WHIRLPOOL 36c314c23edaf83cc4a56e6d5b4f7465b78fc281990841f71bf3458bef54df2d2ffdf8f4307602dce7bfe3761b278fc0eb2acf8ed87df7b873e691ec4f7f907f
EBUILD libidn-1.33.ebuild 2864 SHA256 66d2508fb3abf2ccc39c755623a1815d149e840c96b34f7ac86089eafd63a120 SHA512 38fdaf661d0b36d1a03c8277e9dd5548982e21fd42c7430aa4158626554e281a0dc632c1c47a18ac2b6f02561d28e64ac34f8150a668c890b52c37c722e63440 WHIRLPOOL a2578cec3621293112d79a2128240e10ed2012d33fab833e1781b8bb7c1a99e9d05864ddf9e7a4f931ee9b222d80ae9e0b2bcfdb1ec7737adf1fa7d560f44613
diff --git a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch b/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch
index 2ddf3fdd..5c2e0a91 100644
--- a/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch
+++ b/net-dns/libidn/files/libidn-1.33-CVE-2017-14062.patch
@@ -30,3 +30,48 @@ index 86819a7..49250a1 100644
--
1.9.1
+From 6c8a9375641ca283b50f9680c90dcd57f9c44798 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Wed, 4 Oct 2017 15:22:43 +0200
+Subject: [PATCH] lib/punycode.c (decode_digit): Really fix integer overflow
+
+The fix in commit e9e81b8063b095b02cf104bb992fa9bf9515b9d8
+was incomplete.
+
+Reported-by: Christian Weisgerber
+---
+ lib/punycode.c | 4 ++--
+ tests/tst_idna.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/punycode.c b/lib/punycode.c
+index 49250a1..d475b6d 100644
+--- a/lib/punycode.c
++++ b/lib/punycode.c
+@@ -91,8 +91,8 @@ enum
+ static unsigned
+ decode_digit (int cp)
+ {
+- return (unsigned) cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
+- cp - 97 < 26 ? cp - 97 : base;
++ return (unsigned) (cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
++ cp - 97 < 26 ? cp - 97 : base);
+ }
+
+ /* encode_digit(d,flag) returns the basic code point whose value */
+diff --git a/tests/tst_idna.c b/tests/tst_idna.c
+index 4ac046f..7fb58b9 100644
+--- a/tests/tst_idna.c
++++ b/tests/tst_idna.c
+@@ -211,7 +211,7 @@ static const struct idna idna[] = {
+ 'x', 'n', '-', '-', 'f', 'o', 0x3067},
+ IDNA_ACE_PREFIX "too long too long too long too long too long too "
+ "long too long too long too long too long ", 0,
+- IDNA_CONTAINS_ACE_PREFIX, IDNA_PUNYCODE_ERROR}
++ IDNA_CONTAINS_ACE_PREFIX, IDNA_INVALID_LENGTH}
+ };
+
+ void
+--
+1.9.1
+