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

OpenSSL 1.1 compatibility patches #2126

Closed
wants to merge 2 commits into from

Conversation

MarkusTeufelberger
Copy link
Collaborator

@MarkusTeufelberger MarkusTeufelberger commented May 28, 2017

OpenSSL removed SSL_R_SHORT_READ upstream

See #2047

SSL_R_SHORT_READ was removed in openssl/openssl@45f55f6 about 2.5 years ago.

This still will not allow rippled to build with OpenSSL 1.1.0, but it fixes one of the two main error sites (the other one being src/ripple/basics/impl/make_SSLContext.cpp, see #1914).

Edit: make_SSLContext.cpp is fixed now too, there was only a single problematic function and it tries to set a deprecated flag.

@codecov-io
Copy link

codecov-io commented May 28, 2017

Codecov Report

Merging #2126 into develop will increase coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #2126      +/-   ##
===========================================
+ Coverage    68.97%   68.98%   +<.01%     
===========================================
  Files          684      684              
  Lines        50394    50394              
===========================================
+ Hits         34761    34762       +1     
+ Misses       15633    15632       -1
Impacted Files Coverage Δ
src/ripple/basics/impl/make_SSLContext.cpp 52.22% <ø> (-1.28%) ⬇️
src/ripple/beast/asio/ssl_error.h 90.9% <ø> (ø) ⬆️
src/ripple/basics/DecayingSample.h 86.11% <0%> (+8.33%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a92f5b8...a4a440b. Read the comment docs.

@MarkusTeufelberger MarkusTeufelberger changed the title Remove SSL_R_SHORT_READ detection OpenSSL 1.1 compatibility patches Jun 4, 2017
@MarkusTeufelberger
Copy link
Collaborator Author

I don't expect this to be merged in this state, but at least it build for me now with OpenSSL 1.1 and it doesn't impact anything since the 2 problematic features that caused compiler errors are deprecated already.

There are still some deprecation warnings left and some functions should maybe anyways be removed - I personally am not going to work on this PR any more than this, since my main goal was to be able to compile rippled on current distributions with OpenSSL 1.1 - and it is already reached.

@MarkusTeufelberger
Copy link
Collaborator Author

Rebased to 0.70.0-b7.

@MarkusTeufelberger
Copy link
Collaborator Author

#2151 is probably the better patch for this, closing this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants