From c0292d34640edde1d8e168fb47b437bb7c649645 Mon Sep 17 00:00:00 2001 From: Alice Maz Date: Thu, 4 May 2017 06:08:37 -0500 Subject: [PATCH] servo: Merge #16706 - Bump base64 to 0.4.2 (from alicemaz:master); r=nox we have just released a security patch for base64 (preventing integer overflow when sizing a buffer for encoded output). this bumps the version in the three Cargo.toml files that pull it in. there should be no observable difference in behavior, no non-malicious input should be able to trigger this state --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). - [ ] There are tests for these changes OR - [X] These changes do not require tests because it is a small fix to a dependency with no practical difference in operation from previous. Source-Repo: https://github.com/servo/servo Source-Revision: 6aa552d59f21644ed93b17b1cec4197cd354b882 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : d5d59c0fff40d88c12de844ab50cc0f9249f46ab --- servo/Cargo.lock | 10 +++++----- servo/components/net/Cargo.toml | 2 +- servo/components/script/Cargo.toml | 2 +- servo/components/webdriver_server/Cargo.toml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/servo/Cargo.lock b/servo/Cargo.lock index 96e0f655b125..2738e6004add 100644 --- a/servo/Cargo.lock +++ b/servo/Cargo.lock @@ -141,7 +141,7 @@ dependencies = [ [[package]] name = "base64" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1695,7 +1695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" name = "net" version = "0.0.1" dependencies = [ - "base64 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "brotli 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "devtools_traits 0.0.1", @@ -2259,7 +2259,7 @@ dependencies = [ "app_units 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "atomic_refcell 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "audio-video-metadata 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "bluetooth_traits 0.0.1", "byteorder 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3172,7 +3172,7 @@ dependencies = [ name = "webdriver_server" version = "0.0.1" dependencies = [ - "base64 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "cookie 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3354,7 +3354,7 @@ dependencies = [ "checksum azure 0.15.0 (git+https://github.com/servo/rust-azure)" = "" "checksum backtrace 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f551bc2ddd53aea015d453ef0b635af89444afa5ed2405dd0b2062ad5d600d80" "checksum backtrace-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d192fd129132fbc97497c1f2ec2c2c5174e376b95f535199ef4fe0a293d33842" -"checksum base64 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9892882c3bd89ed02dec391c128984c772b663a29700c32b5de0b33861cdf2bd" +"checksum base64 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "979d348dc50dfcd050a87df408ec61f01a0a27ee9b4ebdc6085baba8275b2c7f" "checksum binary-space-partition 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "df65281d9b2b5c332f5bfbd9bb5e5f2e62f627c259cf9dc9cd10fecb758be33d" "checksum bincode 1.0.0-alpha6 (registry+https://github.com/rust-lang/crates.io-index)" = "fb0cdeac1c5d567fdb487ae5853c024e4acf1ea85ba6a6552fe084e0805fea5d" "checksum bindgen 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88f9d9abd7964621201c558021ff4f39b7b4d571a9a56a88844da9971e2344ce" diff --git a/servo/components/net/Cargo.toml b/servo/components/net/Cargo.toml index 47f412f28fab..e241d55f908c 100644 --- a/servo/components/net/Cargo.toml +++ b/servo/components/net/Cargo.toml @@ -10,7 +10,7 @@ name = "net" path = "lib.rs" [dependencies] -base64 = "0.4.1" +base64 = "0.4.2" brotli = "1.0.6" cookie = "0.6" devtools_traits = {path = "../devtools_traits"} diff --git a/servo/components/script/Cargo.toml b/servo/components/script/Cargo.toml index 76facbdc2ec4..1266e7065823 100644 --- a/servo/components/script/Cargo.toml +++ b/servo/components/script/Cargo.toml @@ -28,7 +28,7 @@ angle = {git = "https://github.com/servo/angle", branch = "servo"} app_units = "0.4" audio-video-metadata = "0.1.2" atomic_refcell = "0.1" -base64 = "0.4.1" +base64 = "0.4.2" bitflags = "0.7" bluetooth_traits = {path = "../bluetooth_traits"} byteorder = "1.0" diff --git a/servo/components/webdriver_server/Cargo.toml b/servo/components/webdriver_server/Cargo.toml index 13647ef703d8..43204dbd0314 100644 --- a/servo/components/webdriver_server/Cargo.toml +++ b/servo/components/webdriver_server/Cargo.toml @@ -10,7 +10,7 @@ name = "webdriver_server" path = "lib.rs" [dependencies] -base64 = "0.4.1" +base64 = "0.4.2" cookie = "0.6" euclid = "0.11" hyper = "0.10"