This revision was automatically updated to reflect the committed changes.
heikobecker marked an inline comment as done.
Closed by commit R239:00cae452ac61: Fix build with LibreSSL (authored by
heikobecker).
REPOSITORY
R239 KDELibs4Support
CHANGES SINCE LAST UPDATE
dfaure accepted this revision.
This revision is now accepted and ready to land.
REPOSITORY
R239 KDELibs4Support
BRANCH
master
REVISION DETAIL
https://phabricator.kde.org/D8672
To: heikobecker, #frameworks, #freebsd, dfaure
Cc: dfaure, asturmlechner
heikobecker marked an inline comment as done.
heikobecker added inline comments.
INLINE COMMENTS
> dfaure wrote in ksslcertificate.cpp:1225
> This seems to be missing parenthesis...
>
> KSSL_HAVE_SSL && ( ... || ... )
Thanks, added.
REPOSITORY
R239 KDELibs4Support
REVISION DETAIL
dfaure requested changes to this revision.
dfaure added a comment.
This revision now requires changes to proceed.
One last issue...
INLINE COMMENTS
> ksslcertificate.cpp:1225
> // no equivalent in OpenSSL 1.1.0 (?), so behave as if we had no
> OpenSSL at all
> -#if KSSL_HAVE_SSL &&
heikobecker marked an inline comment as done.
heikobecker added inline comments.
INLINE COMMENTS
> dfaure wrote in kopenssl.cpp:1047
> this syntax will lead to a preprocessor warning when LIBRESSL_VERSION_NUMBER
> isn't defined.
> Did you mean `|| defined(...)` ?
Yeah, that's indeed better...
heikobecker updated this revision to Diff 23301.
heikobecker added a comment.
Added define(..)
REPOSITORY
R239 KDELibs4Support
CHANGES SINCE LAST UPDATE
https://phabricator.kde.org/D8672?vs=21939=23301
BRANCH
master
REVISION DETAIL
https://phabricator.kde.org/D8672
AFFECTED FILES
dfaure requested changes to this revision.
dfaure added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> kopenssl.cpp:1047
> {
> -#if OPENSSL_VERSION_NUMBER < 0x1010L
> +#if OPENSSL_VERSION_NUMBER < 0x1010L || LIBRESSL_VERSION_NUMBER
> if (psig) {
heikobecker added a reviewer: FreeBSD.
REPOSITORY
R239 KDELibs4Support
REVISION DETAIL
https://phabricator.kde.org/D8672
To: heikobecker, #frameworks, #freebsd
heikobecker added a comment.
Ping?
REPOSITORY
R239 KDELibs4Support
REVISION DETAIL
https://phabricator.kde.org/D8672
To: heikobecker, #frameworks
heikobecker created this revision.
heikobecker added a reviewer: Frameworks.
Restricted Application added a project: Frameworks.
REVISION SUMMARY
Unfortunately LibreSSL sets OPENSSL_VERSION_NUMBER to
0x2000L and doesn't support the OpenSSL 1.1 API.
TEST PLAN
Builds with LibreSSL
10 matches
Mail list logo