Skip to content

Initialize Libgcrypt properly #43

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

Merged
dmuhamedagic merged 2 commits into from
Jun 10, 2016
Merged

Initialize Libgcrypt properly #43

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da79b8b
Refactor: main: substitute is_auth_req macro
jnpkrn Jun 9, 2016
bf6e9b1
Med: main: initialize Libcrypt properly before the first use
jnpkrn Jun 9, 2016
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
15 changes: 14 additions & 1 deletion src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
#include <pacemaker/crm/services.h>

#include "b_config.h"

#if HAVE_LIBGCRYPT
#include <gcrypt.h>
#endif
#ifndef NAMETAG_LIBSYSTEMD
#include <clplumbing/setproctitle.h>
#else
Expand Down Expand Up @@ -353,10 +357,19 @@ static int setup_config(int type)
if (rv < 0)
goto out;

if (booth_conf->authfile[0] != '\0') {
if (is_auth_req()) {
rv = read_authkey();
if (rv < 0)
goto out;
#if HAVE_LIBGCRYPT
if (!gcry_check_version(NULL)) {
log_error("gcry_check_version");
rv = -ENOENT;
goto out;
}
gcry_control(GCRYCTL_DISABLE_SECMEM, 0);
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
#endif
}

/* Set "local" pointer, ignoring errors. */
Expand Down