rust
/
cargo
mirror of https://github.com/rust-lang/cargo
0
0
Fork 0
Code Issues Releases Wiki Activity

Auto merge of #3602 - alexcrichton:beta-next, r=alexcrichton 

Update OpenSSL to 1.0.2k

Updates in accordance with the security advisory issued today.
This commit is contained in:
bors 2017-01-27 07:50:00 +00:00
parent bfee18f732 2d932dc934
commit 6e0c18cccc
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -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

3
tests/cargotest/lib.rs
View File

@ -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;