From c22df13d9548ac99ed7a50f462227523ee15d8ed Mon Sep 17 00:00:00 2001 From: Paul Fariello Date: Thu, 11 Jul 2019 18:51:03 +0320 Subject: [PATCH] Dirty fix libgcrypt memleak --- prof.supp | 10 ++++++++++ src/omemo/crypto.c | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/prof.supp b/prof.supp index bc9ca50a..f894dc75 100644 --- a/prof.supp +++ b/prof.supp @@ -1176,3 +1176,13 @@ fun:SHA1_Update } + +# gcrypt initialization +{ + gcry_rngcsprng_randomize + Memcheck:Leak + fun:malloc + ... + fun:omemo_crypto_init + ... +} diff --git a/src/omemo/crypto.c b/src/omemo/crypto.c index 81d7c922..5a67c3b1 100644 --- a/src/omemo/crypto.c +++ b/src/omemo/crypto.c @@ -55,6 +55,11 @@ omemo_crypto_init(void) gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); + /* Ask for a first random buffer to ensure CSPRNG is initialized. + * Thus we control the memleak produced by gcrypt initialization and we can + * suppress it without having false negatives */ + gcry_free(gcry_random_bytes_secure(1, GCRY_VERY_STRONG_RANDOM)); + return 0; }