Differential D8672

Fix build with LibreSSL
ClosedPublic
Actions

Authored by heikobecker on Nov 5 2017, 10:51 PM.

Details

Reviewers
dfaure
Group Reviewers
Frameworks
FreeBSD
Commits
R239:00cae452ac61: Fix build with LibreSSL
Summary

Unfortunately LibreSSL sets OPENSSL_VERSION_NUMBER to
0x20000000L and doesn't support the OpenSSL 1.1 API.

Test Plan

Builds with LibreSSL

Diff Detail

Repository
R239 KDELibs4Support
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
heikobecker created this revision.Nov 5 2017, 10:51 PM
Restricted Application added a project: Frameworks. · View Herald TranscriptNov 5 2017, 10:51 PM
dfaure requested changes to this revision.Dec 2 2017, 4:53 PM
dfaure added a subscriber: dfaure.
dfaure added inline comments.
src/kssl/kopenssl.cpp
1047

this syntax will lead to a preprocessor warning when LIBRESSL_VERSION_NUMBER isn't defined.
Did you mean || defined(...) ?

This revision now requires changes to proceed.Dec 2 2017, 4:53 PM
heikobecker updated this revision to Diff 23301.Dec 2 2017, 6:09 PM

Added define(..)

heikobecker marked an inline comment as done.Dec 2 2017, 6:10 PM
heikobecker added inline comments.
src/kssl/kopenssl.cpp
1047

Yeah, that's indeed better...

dfaure requested changes to this revision.Dec 2 2017, 7:26 PM

One last issue...

src/kssl/ksslcertificate.cpp
1225

This seems to be missing parenthesis...

KSSL_HAVE_SSL && ( ... || ... )

This revision now requires changes to proceed.Dec 2 2017, 7:26 PM
heikobecker updated this revision to Diff 23309.Dec 2 2017, 8:05 PM
heikobecker marked an inline comment as done.

Addressed raised issue

heikobecker marked an inline comment as done.Dec 2 2017, 8:06 PM
heikobecker added inline comments.
src/kssl/ksslcertificate.cpp
1225

Thanks, added.

dfaure accepted this revision.Dec 2 2017, 8:06 PM
This revision is now accepted and ready to land.Dec 2 2017, 8:06 PM
Closed by commit R239:00cae452ac61: Fix build with LibreSSL (authored by heikobecker). · Explain WhyDec 2 2017, 8:08 PM
This revision was automatically updated to reflect the committed changes.
heikobecker marked an inline comment as done.

Revision Contents
Changeset List

PathPackages
Msrc/kssl/kopenssl.h (2 lines)
Msrc/kssl/kopenssl.cpp (34 lines)
Msrc/kssl/ksslcertificate.cpp (2 lines)

Diff 23310

View Options

src/kssl/kopenssl.h

Loading...
View Options

src/kssl/kopenssl.cpp

Loading...
View Options

src/kssl/ksslcertificate.cpp

Loading...