Update for OpenSSL >= 1.1.0 #85

Merged
SlavekB merged 1 commits from openssl11_fixes into master 4 years ago
Owner

Needs #ifdef guards for OpenSSL < 1.1

Needs #ifdef guards for OpenSSL < 1.1
Owner

Hi Tim, same applies here. Could you sign-off your commit with -s? Thanks.

Hi Tim, same applies here. Could you sign-off your commit with -s? Thanks.
Owner

Thanks Tim! 😄

Thanks Tim! :smile:
Poster
Owner

No problem. It's great to be able to work on TDE again, even for a short time!

No problem. It's great to be able to work on TDE again, even for a short time!
Owner

I added #ifdef to re-enable compatibility with OpenSSL < 1.1 and hope to LibreSSL as well. Tested successfully on Bullseye and Jessie.

In any case, as a separate task, it will be useful here to replace direct calls to SSL functions with KSSL proxy functions, so that we again avoid direct dependence on SSL libraries for tdelibs.

I added `#ifdef` to re-enable compatibility with OpenSSL < 1.1 and hope to LibreSSL as well. Tested successfully on Bullseye and Jessie. In any case, as a separate task, it will be useful here to replace direct calls to SSL functions with KSSL proxy functions, so that we again avoid direct dependence on SSL libraries for tdelibs.
Owner

I looked into adding those KOpenSSLProxy functions, only to realize at build time that this would add a circular dependency between tdecore and tdeio. So we either don't use the proxy in tdecore (as it is now) or we need to move KOpenSSLProxy to tdecore.

What is your opinion?

I looked into adding those KOpenSSLProxy functions, only to realize at build time that this would add a circular dependency between tdecore and tdeio. So we either don't use the proxy in tdecore (as it is now) or we need to move KOpenSSLProxy to tdecore.<br/> What is your opinion?
Owner

Very good comment about KSSL and tdecore × tdeio! I didn't realize it before. I suggest merging this PR now and then finding a solution to remove the SSL hard linking as a separate issue.

Very good comment about KSSL and tdecore × tdeio! I didn't realize it before. I suggest merging this PR now and then finding a solution to remove the SSL hard linking as a separate issue.
Owner

I agree we can merge. Let me add a small code refactoring later tonight, then we can merge.

I agree we can merge. Let me add a small code refactoring later tonight, then we can merge.
Owner

I added a small commit that refactors the code, getting rid of one #ifdef block and unifying the syntax of the other 3 #ifdef.

If no further comments or objections, we can merge.

I added a small commit that refactors the code, getting rid of one #ifdef block and unifying the syntax of the other 3 #ifdef.<br/> If no further comments or objections, we can merge.
MicheleC added this to the R14.1.0 release milestone 4 years ago
SlavekB closed this pull request 4 years ago
SlavekB deleted branch openssl11_fixes 4 years ago
The pull request has been merged as d78af7ef55.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
3 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/tdelibs#85
Loading…
There is no content yet.