Update dependencies for OpenSSL 1.1.0 compatibility #3272

cuviper · 2016-11-08T09:38:41Z

The primary targets here are openssl and openssl-sys crates 0.9,
bringing support for OpenSSL 1.1.0. This requires updating the curl
and git2 related dependencies as well.

A small change is required in cargo itself for the new Hasher API.
Results from the hasher are simply unwrapped for now, matching the
Windows behavior that already panics on error.

rust-highfive · 2016-11-08T09:38:54Z

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

alexcrichton · 2016-11-08T15:03:48Z

I've been passively trying to do this but the git2 behavior changed linking to libcurl enough that it's been difficult to find time to fix all the tests. It looks like the Travis builds may also be failing?

cuviper · 2016-11-09T02:16:16Z

Sorry, simply missing the new OPENSSL_DIR was the main problem for Travis. Linux is all green now, but OSX still failed, and I don't have the means to debug that myself.

What are the git2/libcurl problems you're referring to?

Anyway, I've opened the PR to maintainer pushes if you'd like to add anything, however passively. :)

alexcrichton

Hm ok, I'll try poking around.

A major change in libgit2 is that it attempts to use libcurl by default now, which isn't always what we might want. I've been wrangling with the various options there, though.

alexcrichton · 2016-11-09T15:03:24Z

.travis.yml

@@ -25,6 +25,7 @@ matrix:
           MACOSX_DEPLOYMENT_TARGET=10.7
      os: osx
      before_install:
+        - export OPENSSL_DIR=`brew --prefix openssl`
        - export OPENSSL_INCLUDE_DIR=`brew --prefix openssl`/include


I think these env vars can be removed now

alexcrichton · 2016-11-09T15:03:57Z

Cargo.toml

@@ -26,12 +26,12 @@ env_logger = "0.3"
 filetime = "0.1"
 flate2 = "0.2"
 fs2 = "0.2"
-git2 = "0.4"
-git2-curl = "0.5"
+git2 = "0.5"


Ah FWIW I had to end up yanking the 0.5 release that had support for openssl 1.1, so this'll need to be updated to 0.6 now

alexcrichton · 2016-11-09T15:04:17Z

Makefile.in

@@ -251,10 +251,12 @@ target/openssl/$(1).stamp: target/openssl/openssl-$$(OPENSSL_VERS).tar.gz \

 # variables read by various build scripts to find openssl
 cargo-$(1): export OPENSSL_STATIC := 1
+cargo-$(1): export OPENSSL_DIR := $$(OPENSSL_INSTALL_$(1))
 cargo-$(1): export OPENSSL_ROOT_DIR := $$(OPENSSL_INSTALL_$(1))
 cargo-$(1): export OPENSSL_LIB_DIR := $$(OPENSSL_INSTALL_$(1))/lib
 cargo-$(1): export OPENSSL_INCLUDE_DIR := $$(OPENSSL_INSTALL_$(1))/include


lib/include here I believe can be removed

alexcrichton · 2016-11-10T03:05:49Z

Ok, pushed a number of updates and fixes, the remaining errors seem easy to deal with, just need to figure them out.

cuviper · 2016-11-10T08:02:33Z

The AppVeyor failure couldn't remove a build directory -- possibly spurious?

The OSX failure got a signal 4, SIGILL? -- don't know what to think about that.

alexcrichton · 2016-11-10T15:10:30Z

Ah yeah AppVeyor looks spurious, didn't realize that OSX was signal 4... Odd! I'll poke around locally.

alexcrichton · 2016-11-10T15:44:20Z

Looks like a legit segfault in libgit2, going to try to fix

alexcrichton · 2016-11-10T16:04:11Z

I've submitted a PR to fix the fault in libgit2

alexcrichton · 2016-11-11T15:23:37Z

Ok, fix merged upstream in libgit2, and libgit2-sys is updated. Pushed and let's see what CI think.

alexcrichton · 2016-11-11T16:20:19Z

@bors: r+

Alright, let's see if it lands!

bors · 2016-11-11T16:20:21Z

📌 Commit 803ab53 has been approved by alexcrichton

alexcrichton · 2016-11-11T16:35:44Z

@bors: r+

bors · 2016-11-11T16:35:45Z

📌 Commit 68fc813 has been approved by alexcrichton

bors · 2016-11-11T16:49:17Z

⌛ Testing commit 68fc813 with merge ac9adc0...

sfackler · 2016-11-11T16:52:21Z

FYI, you'll need to upgrade to rust-openssl 0.9.1 to fix a bug that broke EOF detection in OpenSSL 1.1.0c if you're using SslStream.

bors · 2016-11-11T16:52:27Z

💔 Test failed - cargo-cross-linux

alexcrichton · 2016-11-11T16:59:00Z

@bors: retry

@sfackler oh we're not actually using that at all yet in Cargo, just the openssl-sys crate to link to OpenSSL itself. Cargo only very lightly uses OpenSSL to do a bit of hashing, but other than that the openssl crate itself isn't used.

cuviper · 2016-11-11T17:11:01Z

Not even in the transitive dependencies? The version here is chosen for everyone, after all...

alexcrichton · 2016-11-11T17:11:39Z

Yep, as the author of most of them, I can tell you the openssl crate basically isn't used.

cuviper · 2016-11-11T17:13:12Z

Heh, fair enough.

bors · 2016-11-11T18:53:03Z

⌛ Testing commit 68fc813 with merge c4711c6...

alexcrichton · 2016-11-14T17:45:16Z

@bors: r+

bors · 2016-11-14T17:45:18Z

📌 Commit 0eed456 has been approved by alexcrichton

bors · 2016-11-14T17:45:21Z

⌛ Testing commit 0eed456 with merge 35bd5f8...

bors · 2016-11-14T18:33:24Z

💔 Test failed - cargo-cross-linux

alexcrichton · 2016-11-14T19:22:07Z

@bors: r+

bors · 2016-11-14T19:22:07Z

📌 Commit 77f5cff has been approved by alexcrichton

bors · 2016-11-14T19:22:10Z

⌛ Testing commit 77f5cff with merge 1b19f25...

bors · 2016-11-14T20:06:16Z

💔 Test failed - cargo-cross-linux

alexcrichton · 2016-11-14T20:36:13Z

@bors: r+

bors · 2016-11-14T20:36:14Z

📌 Commit 5fa52dc has been approved by alexcrichton

bors · 2016-11-14T20:36:16Z

⌛ Testing commit 5fa52dc with merge 5c53c9c...

bors · 2016-11-14T21:08:10Z

💔 Test failed - cargo-cross-linux

alexcrichton · 2016-11-14T21:56:00Z

@bors: r+

bors · 2016-11-14T21:56:04Z

📌 Commit 15acaa9 has been approved by alexcrichton

bors · 2016-11-14T21:56:07Z

⌛ Testing commit 15acaa9 with merge 9f1beaf...

Update dependencies for OpenSSL 1.1.0 compatibility The primary targets here are openssl and openssl-sys crates 0.9, bringing support for OpenSSL 1.1.0. This requires updating the curl and git2 related dependencies as well. A small change is required in cargo itself for the new Hasher API. Results from the hasher are simply unwrapped for now, matching the Windows behavior that already panics on error.

bors · 2016-11-15T01:10:44Z

☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64
Approved by: alexcrichton
Pushing 9f1beaf to master...

cuviper · 2016-11-15T01:13:27Z

@alexcrichton Thanks for hammering that through!

rust-highfive assigned brson Nov 8, 2016

cuviper force-pushed the openssl-1.1.0 branch from 85ae919 to 8c5e890 Compare November 9, 2016 01:32

alexcrichton reviewed Nov 9, 2016

View reviewed changes

alexcrichton assigned alexcrichton and unassigned brson Nov 9, 2016

alexcrichton force-pushed the openssl-1.1.0 branch from a35107b to 803ab53 Compare November 11, 2016 16:20

alexcrichton force-pushed the openssl-1.1.0 branch from 803ab53 to 68fc813 Compare November 11, 2016 16:35

alexcrichton mentioned this pull request Nov 11, 2016

Cargo behind a proxy #636

Closed

alexcrichton force-pushed the openssl-1.1.0 branch from a04c580 to 0eed456 Compare November 14, 2016 17:44

alexcrichton force-pushed the openssl-1.1.0 branch from 0eed456 to 77f5cff Compare November 14, 2016 19:22

alexcrichton force-pushed the openssl-1.1.0 branch from 77f5cff to 5fa52dc Compare November 14, 2016 20:35

More updates for OpenSSL 1.1.0

15acaa9

alexcrichton force-pushed the openssl-1.1.0 branch from 5fa52dc to 15acaa9 Compare November 14, 2016 21:55

bors merged commit 15acaa9 into rust-lang:master Nov 15, 2016

bors mentioned this pull request Nov 15, 2016

Resubmission of templating PR (#1747) #3004

Merged

alexcrichton mentioned this pull request Nov 23, 2016

Beta cargo version needs to change rust-lang/rust#37969

Closed

ehuss added this to the 1.14.0 milestone Feb 6, 2022

Update dependencies for OpenSSL 1.1.0 compatibility #3272

Update dependencies for OpenSSL 1.1.0 compatibility #3272

Uh oh!

Conversation

cuviper commented Nov 8, 2016

Uh oh!

rust-highfive commented Nov 8, 2016

Uh oh!

alexcrichton commented Nov 8, 2016

Uh oh!

cuviper commented Nov 9, 2016

Uh oh!

alexcrichton left a comment

Choose a reason for hiding this comment

Uh oh!

alexcrichton Nov 9, 2016

Choose a reason for hiding this comment

Uh oh!

alexcrichton Nov 9, 2016

Choose a reason for hiding this comment

Uh oh!

alexcrichton Nov 9, 2016

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented Nov 10, 2016

Uh oh!

cuviper commented Nov 10, 2016

Uh oh!

alexcrichton commented Nov 10, 2016

Uh oh!

alexcrichton commented Nov 10, 2016

Uh oh!

alexcrichton commented Nov 10, 2016

Uh oh!

alexcrichton commented Nov 11, 2016

Uh oh!

alexcrichton commented Nov 11, 2016

Uh oh!

bors commented Nov 11, 2016

Uh oh!

alexcrichton commented Nov 11, 2016

Uh oh!

bors commented Nov 11, 2016

Uh oh!

bors commented Nov 11, 2016

Uh oh!

sfackler commented Nov 11, 2016

Uh oh!

bors commented Nov 11, 2016

Uh oh!

alexcrichton commented Nov 11, 2016

Uh oh!

cuviper commented Nov 11, 2016

Uh oh!

alexcrichton commented Nov 11, 2016

Uh oh!

cuviper commented Nov 11, 2016

Uh oh!

bors commented Nov 11, 2016

Uh oh!

alexcrichton commented Nov 14, 2016

Uh oh!

bors commented Nov 14, 2016

Uh oh!

bors commented Nov 14, 2016

Uh oh!

bors commented Nov 14, 2016

Uh oh!

alexcrichton commented Nov 14, 2016

Uh oh!

bors commented Nov 14, 2016

Uh oh!

bors commented Nov 14, 2016

Uh oh!

bors commented Nov 14, 2016

Uh oh!

alexcrichton commented Nov 14, 2016

Uh oh!

bors commented Nov 14, 2016

Uh oh!