From 59b092267166815d74153fe901a249a0c3fee0d8 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 26 Jan 2017 16:07:14 -0800 Subject: [PATCH 1/2] Update OpenSSL to 1.0.2k Updates in accordance with the security advisory issued today. --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 7a6193e317d..946561dd17c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ CFG_RELEASE_NUM=0.16.0 CFG_RELEASE_LABEL= -OPENSSL_VERS=1.0.2j -OPENSSL_SHA256=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 +OPENSSL_VERS=1.0.2k +OPENSSL_SHA256=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 include config.mk From 2d932dc934a15b1f6cbd0e20231166f1c3c309eb Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 26 Jan 2017 23:49:39 -0800 Subject: [PATCH 2/2] Remove unused crate --- tests/cargotest/lib.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/cargotest/lib.rs b/tests/cargotest/lib.rs index cc5b17cf01c..affb7863795 100644 --- a/tests/cargotest/lib.rs +++ b/tests/cargotest/lib.rs @@ -15,9 +15,6 @@ extern crate url; #[cfg(windows)] extern crate kernel32; #[cfg(windows)] extern crate winapi; -#[macro_use] -extern crate log; - use cargo::util::Rustc; use std::ffi::OsStr; use std::time::Duration;