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

Support openssl 1.1 #1281

Merged
merged 3 commits into from
Dec 15, 2016
Merged

Support openssl 1.1 #1281

merged 3 commits into from
Dec 15, 2016

Conversation

lbudai
Copy link
Collaborator

@lbudai lbudai commented Dec 14, 2016

No description provided.

ssl_ctx_st structure is a non-exported interface (ssl/ssl_locl.h)

Note, that the getter(`SSL_CTX_get0_param`) function available
from version 1.0.2 but minimum supported OpenSSL version is 0.98.
This is why a function with the same name is initiated when
this getter is not available.

Signed-off-by: Laszlo Budai <stentor.bgyk@gmail.com>
Signed-off-by: Laszlo Budai <stentor.bgyk@gmail.com>
Copy link
Collaborator

@bazsi bazsi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apart from the config.h include this looks good.

I like the compat based solution.


#include <arpa/inet.h>
#include <unistd.h>
#include <openssl/x509_vfy.h>
#include <openssl/x509v3.h>
#include <openssl/err.h>
#include <openssl/rand.h>
#include <syslog-ng-config.h>

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be included via syslog-ng.h and not directly.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@czanik
Copy link
Contributor

czanik commented Dec 15, 2016

Thanks, I just tested and it works fine. https://copr.fedorainfracloud.org/coprs/czanik/syslog-ng-githead/ was built with it.

Fixes: syslog-ng#1234

Signed-off-by: Laszlo Budai <Laszlo.Budai@balabit.com>
@lbudai
Copy link
Collaborator Author

lbudai commented Dec 15, 2016

@bazsi : could you approve the changes? until that the PR is blocked...

@bazsi bazsi merged commit ab4b044 into syslog-ng:master Dec 15, 2016
@bazsi bazsi removed the in progress label Dec 15, 2016
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