Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2015-09-17 08:14:57 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2015-10-16 10:38:19 (GMT) |
| commit | 3a2b966711dbe6fa937c485d7ad56916219badb2 (patch) | |
| tree | 30e9f30bc3f2a3ca6b4ed0c5c11f4ae0703485d0 /Swiften/IDN/SConscript | |
| parent | 582ca915b5b82ada46d1183a7b882455ee01b7b1 (diff) | |
| download | swift-3a2b966711dbe6fa937c485d7ad56916219badb2.zip swift-3a2b966711dbe6fa937c485d7ad56916219badb2.tar.bz2 | |
Add UTF-8 validation function and validate input to libIDN functions
This is required to protect against the CVE-2015-2059 vulnerability in
libIDN.
Test-Information:
Added unit tests for UTF-8 validation and tested that existing unit
tests still pass.
Change-Id: I0a94136894c6e0004081456c59155a78a3dabf5f
Diffstat (limited to 'Swiften/IDN/SConscript')
| -rw-r--r-- | Swiften/IDN/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Swiften/IDN/SConscript b/Swiften/IDN/SConscript index 4c1a71d..7a3c061 100644 --- a/Swiften/IDN/SConscript +++ b/Swiften/IDN/SConscript | |||
| @@ -12,17 +12,20 @@ if myenv.get("HAVE_ICU") : | |||
| 12 | objects += myenv.SwiftenObject(["ICUConverter.cpp"]) | 12 | objects += myenv.SwiftenObject(["ICUConverter.cpp"]) |
| 13 | if myenv.get("HAVE_LIBIDN") : | 13 | if myenv.get("HAVE_LIBIDN") : |
| 14 | myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"]) | 14 | myenv.MergeFlags(swiften_env["LIBIDN_FLAGS"]) |
| 15 | myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"]) | 15 | myenv.Append(CPPDEFINES = ["HAVE_LIBIDN"]) |
| 16 | objects += myenv.SwiftenObject(["LibIDNConverter.cpp"]) | 16 | objects += myenv.SwiftenObject(["LibIDNConverter.cpp"]) |
| 17 | objects += myenv.SwiftenObject(["PlatformIDNConverter.cpp"]) | 17 | objects += myenv.SwiftenObject([ |
| 18 | "PlatformIDNConverter.cpp" | ||
| 19 | ]) | ||
| 18 | 20 | ||
| 19 | swiften_env.Append(SWIFTEN_OBJECTS = [objects]) | 21 | swiften_env.Append(SWIFTEN_OBJECTS = [objects]) |
| 20 | 22 | ||
| 21 | if env["TEST"] : | 23 | if env["TEST"] : |
| 22 | test_env = myenv.Clone() | 24 | test_env = myenv.Clone() |
| 23 | test_env.UseFlags(swiften_env["CPPUNIT_FLAGS"]) | 25 | test_env.UseFlags(swiften_env["CPPUNIT_FLAGS"]) |
| 24 | env.Append(UNITTEST_OBJECTS = test_env.SwiftenObject([ | 26 | env.Append(UNITTEST_OBJECTS = test_env.SwiftenObject([ |
| 25 | File("UnitTest/IDNConverterTest.cpp"), | 27 | File("UnitTest/IDNConverterTest.cpp"), |
| 28 | File("UnitTest/UTF8ValidatorTest.cpp") | ||
| 26 | ])) | 29 | ])) |
| 27 | 30 | ||
| 28 | 31 | ||