Skip to content

neverbleed: fix compilation when lacking engines #28

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.

Sign up for GitHub

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

Open
neheb wants to merge 1 commit into
base: master
Choose a base branch
from
Open

neverbleed: fix compilation when lacking engines #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions neverbleed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,6 +1507,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
close(pipe_fds[0]);
pipe_fds[0] = -1;

#ifndef OPENSSL_NO_ENGINE
/* setup engine */
if ((nb->engine = ENGINE_new()) == NULL || !ENGINE_set_id(nb->engine, "neverbleed") ||
!ENGINE_set_name(nb->engine, "privilege separation software engine") || !ENGINE_set_RSA(nb->engine, rsa_method)
Expand All @@ -1518,6 +1519,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
goto Fail;
}
ENGINE_add(nb->engine);
#endif

/* setup thread key */
pthread_key_create(&nb->thread_key, dispose_thread_data);
Expand All @@ -1536,7 +1538,9 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
if (listen_fd != -1)
close(listen_fd);
if (nb->engine != NULL) {
#ifndef OPENSSL_NO_ENGINE
ENGINE_free(nb->engine);
#endif
nb->engine = NULL;
}
return -1;
Expand Down