Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump rust-openssl, add support for OpenSSL 1.1.0 [WIP] #14484

Closed
wants to merge 18 commits into from

Conversation

@frewsxcv
Copy link
Member

frewsxcv commented Dec 7, 2016

Fixes #14203.

TODO:

  • Stop using a git dep and use this published version: servo/hyper_serde#2
  • Or maybe remove hyper_serde

This change is Reviewable

@highfive
Copy link

highfive commented Dec 7, 2016

Heads up! This PR modifies the following files:

  • @asajeffrey: components/webdriver_server/Cargo.toml
  • @jgraham: components/webdriver_server/Cargo.toml
  • @fitzgen: components/script/Cargo.toml, components/devtools_traits/Cargo.toml, components/devtools_traits/Cargo.toml, components/devtools/Cargo.toml, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml
  • @KiChjang: components/net/Cargo.toml, components/script/Cargo.toml, components/net/cookie.rs, components/net/lib.rs, components/net/http_loader.rs, components/script_traits/Cargo.toml, components/script_traits/Cargo.toml, components/net_traits/Cargo.toml, components/net_traits/Cargo.toml, components/net/resource_thread.rs, components/net/connector.rs
@frewsxcv frewsxcv requested review from wafflespeanut and removed request for wafflespeanut Dec 8, 2016
let ssl_context_builder = ssl_connector_builder.builder_mut();
ssl_context_builder.set_ca_file(ca_file).expect("could not set CA file");
ssl_context_builder.set_cipher_list(DEFAULT_CIPHERS).expect("could not set ciphers");
ssl_context_builder.set_options(SSL_OP_NO_SSLV2 | SSL_OP_NO_SSLV3 | SSL_OP_NO_COMPRESSION);

This comment has been minimized.

@bors-servo
Copy link
Contributor

bors-servo commented Dec 9, 2016

The latest upstream changes (presumably #13489) made this pull request unmergeable. Please resolve the merge conflicts.

@frewsxcv
Copy link
Member Author

frewsxcv commented Dec 10, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Dec 10, 2016

🔒 Merge conflict

@jdm jdm removed the S-awaiting-review label Dec 15, 2016
@fkautz fkautz mentioned this pull request Jan 7, 2017
@avadacatavra
Copy link
Contributor

avadacatavra commented Jan 10, 2017

i'm working on rebasing and updating this

@fkautz
Copy link
Contributor

fkautz commented Jan 13, 2017

@avadacatavra a few updates which may help you

  • hyper 0.10 was released, removes deps on cookie and openssl packages
  • websocket still depends on openssl 0.7 and cookie 0.2
  • cookie 0.2 depends on openssl 0.7, but cookie 0.4 and above already have openssl 0.9 support

[edit: said webdriver package but meant websocket, updated comment directly]

@jdm
Copy link
Member

jdm commented Jan 27, 2017

Not much point in leaving this open. @avadacatavra will open a new PR, presumably.

@jdm jdm closed this Jan 27, 2017
@frewsxcv frewsxcv deleted the frewsxcv:openssl-1.1.0 branch Feb 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

8 participants
You can’t perform that action at this time.