From 1ddbd9fd71502c9332ca84a74734121c407a5708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 29 Jun 2014 23:53:18 +0200 Subject: [PATCH] guix-register: Add explicit libgcrypt initialization. * nix/guix-register/guix-register.cc (main): Add calls to 'gcry_check_version' and 'gcry_control', to appease libgcrypt. --- nix/guix-register/guix-register.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nix/guix-register/guix-register.cc b/nix/guix-register/guix-register.cc index 324673f346..4aee4fde34 100644 --- a/nix/guix-register/guix-register.cc +++ b/nix/guix-register/guix-register.cc @@ -33,6 +33,7 @@ #include #include +#include using namespace nix; @@ -168,6 +169,17 @@ register_validity (LocalStore *store, std::istream &input, int main (int argc, char *argv[]) { + /* Initialize libgcrypt, which is indirectly used. */ + if (!gcry_check_version (GCRYPT_VERSION)) + { + fprintf (stderr, "error: libgcrypt version mismatch\n"); + exit (EXIT_FAILURE); + } + + /* Tell Libgcrypt that initialization has completed, as per the Libgcrypt + 1.6.0 manual (although this does not appear to be strictly needed.) */ + gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); + /* Honor the environment variables, and initialize the settings. */ settings.processEnvironment ();