From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 20 Aug 2012 23:43:37 +0000 (+0200)
Subject: journal: initialize libgcrypt explicitly, before using HMAC
X-Git-Tag: v189~29
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=72fbdd3349ad30d8a5074ea9a650f0909f96c299;ds=sidebyside

journal: initialize libgcrypt explicitly, before using HMAC
---

diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
index fd81797cf..fe5b6bd50 100644
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -413,12 +413,26 @@ finish:
         return r;
 }
 
+static void initialize_libgcrypt(void) {
+        const char *p;
+
+        if (gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
+                return;
+
+        p = gcry_check_version("1.4.5");
+        assert(p);
+
+        gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
+}
+
 int journal_file_hmac_setup(JournalFile *f) {
         gcry_error_t e;
 
         if (!f->seal)
                 return 0;
 
+        initialize_libgcrypt();
+
         e = gcry_md_open(&f->hmac, GCRY_MD_SHA256, GCRY_MD_FLAG_HMAC);
         if (e != 0)
                 return -ENOTSUP;