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

Fix LibreSSL- and -version detection #291

Merged
merged 2 commits into from
Jun 24, 2015
Merged

Fix LibreSSL- and -version detection #291

merged 2 commits into from
Jun 24, 2015

Conversation

Sp1l
Copy link
Contributor

@Sp1l Sp1l commented Apr 11, 2015

Was almost correct...
LibreSSL uses X.Y.Z numbering only whereas OpenSSL uses X.Y.Za numbering (apart from first release of X.Y.Z).
This patch fixes detection of LibreSSL and the version yet keeps OpenSSL detection as intended.
OpenSSL 0.9.8zf
OpenSSL 1.0.1m
OpenSSL 1.0.2
LibreSSL 2.0.5
LibreSSL 2.1.6

OpenSSL version: major=2, minor=1, fix=6
Warning: LibreSSL found, support for LibreSSL is experimental!All modules will be installed.

OpenSSL version: major=1, minor=0, fix=1, patch=l
All modules will be installed.

OpenSSL version: major=1, minor=0, fix=2, patch=a
All modules will be installed.
(OpenSSL 1.0.2 was skipped on FreeBSD, port was upgraded from 1.0.1m to 1.0.2a)

Was almost correct...
LibreSSL uses X.Y.Z numbering only whereas OpenSSL uses X.Y.Za numbering (apart from first release of X.Y.Z).
This patch fixes detection of LibreSSL and the version yet keeps OpenSSL detection as intended.
OpenSSL 0.9.8zf
OpenSSL 1.0.1m
OpenSSL 1.0.2
LibreSSL 2.0.5
LibreSSL 2.1.6

OpenSSL version: major=2, minor=1, fix=6
Warning: LibreSSL found, support for LibreSSL is experimental!All modules will be installed.

OpenSSL version: major=1, minor=0, fix=1, patch=l
All modules will be installed.

OpenSSL version: major=1, minor=0, fix=2, patch=a
All modules will be installed.
(OpenSSL 1.0.2 was skipped on FreeBSD, port was upgraded from 1.0.1m to 1.0.2a)
@svysh
Copy link
Contributor

svysh commented May 19, 2015

Without a fix like this, build of openxpki-0.28.0 breaks if encounters today's libressl-2.1.6.

@oliwel
Copy link
Contributor

oliwel commented May 19, 2015

I will publish a new release hopefully end of this week which will contain this merge. Can you confirm that this fix on top of current develop works?

@oliwel
Copy link
Contributor

oliwel commented May 19, 2015

@Sp1l can you please make pull requests against develop next time, that will speed up integration.

@svysh
Copy link
Contributor

svysh commented May 19, 2015

Hi Oliver. For me it looks like the latest today's commit to develop (edcec2e) is empty. It says:
"Showing 0 changed files with 0 additions and 0 deletions."
At least it does not modify the file in question ..../Makefile.PL. What I am doing wrong?

@svysh
Copy link
Contributor

svysh commented May 19, 2015

Meanwhile, yes I can confirm. Develop brunch (edcec2e) builds ok with libressl-2.1.6. Moreover, tests say PASS, although with lots of warnings.

@svysh
Copy link
Contributor

svysh commented May 19, 2015

And you may want to terminate a message with "\n" in line 118 of ..../Makefile.PL

@oliwel oliwel merged commit a978925 into openxpki:master Jun 24, 2015
@Sp1l
Copy link
Contributor Author

Sp1l commented Jun 24, 2015

Thanks @oliwel! Will try and remember if I create a next patch for OpenXPKI to patch the develop branch instead. (If you had told me earlier I'd have rerolled the patch for that branch :D)

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.

None yet

3 participants