From 78d5f548c42f561189af7ade691ee75289084bc1 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 5 Sep 2018 10:30:44 +0100
Subject: [PATCH] Tweak valgrind suppressions.

---
 run/tests    |  2 +-
 suppressions | 93 +++++++++++-----------------------------------------
 2 files changed, 21 insertions(+), 74 deletions(-)

diff --git a/run/tests b/run/tests
index 73123fc1a..3f465a433 100755
--- a/run/tests
+++ b/run/tests
@@ -13,7 +13,7 @@ elif [ "$1" == "--backtrace" ]; then
 elif [ "$1" == "--valgrind" ]; then
     shift;
 #    valgrind --tool="memcheck" --vgdb=yes --vgdb-error=0 build/test/unit-tests $*
-    valgrind --tool="memcheck" build/test/unit-tests $*
+    valgrind --tool="memcheck" --suppressions=suppressions build/test/unit-tests $*
 elif [ "$1" == "--callgrind" ]; then
     shift;
     valgrind --tool="callgrind" build/test/unit-tests $*
diff --git a/suppressions b/suppressions
index 8efae978b..2d98275cd 100644
--- a/suppressions
+++ b/suppressions
@@ -1,84 +1,31 @@
 {
-   libcrypto.so use of uninitialised
+   Uninitialised value in AES_set_encrypt_key
    Memcheck:Value8
-   obj:/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
-   obj:/lib/x86_64-linux-gnu/libcrypto.so.1.0.0
+   obj:/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
+   fun:AES_set_encrypt_key
+   obj:*
+   obj:*
+   obj:*
+   obj:*
+   obj:*
    obj:*
 }
 
 {
-   uuid 1
-   Memcheck:Cond
-   fun:_ZN4Kumu7bin2hexEPKhjPcj
-   fun:_ZN4Kumu11bin2UUIDhexEPKhjPcj
-   fun:_ZNK4Kumu4UUID9EncodeHexEPcj
-   fun:_ZN3dcp9make_uuidEv
-   ...
-}
-
-{
-   uuid 2
-   Memcheck:Cond
-   fun:strlen
-   fun:_ZNSsC1EPKcRKSaIcE
-   fun:_ZN3dcp9make_uuidEv
-   ...
-}
-
-{
-   uuid 3
-   Memcheck:Cond
-   fun:_ZN4Kumu7hex2binEPKcPhjPj
-   fun:_ZNK3dcp3MXF16fill_writer_infoEPN5ASDCP10WriterInfoESsNS_8StandardE
-   ...
-}
-
-{
-   uuid 4
+   Uninitialised value in AES_set_encrypt_key
    Memcheck:Value8
-   fun:isxdigit
-   fun:_ZN4Kumu7hex2binEPKcPhjPj
-   fun:_ZNK3dcp3MXF16fill_writer_infoEPN5ASDCP10WriterInfoESsNS_8StandardE
-}
-
-{
-   pixman who knows what
-   Memcheck:Cond
-   obj:/usr/lib/x86_64-linux-gnu/libpixman-1.so.0.30.2
-   obj:/usr/lib/x86_64-linux-gnu/libpixman-1.so.0.30.2
-   fun:pixman_image_composite32
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-   obj:/usr/lib/x86_64-linux-gnu/libcairo.so.2.11301.0
-}
-
-{
-   murrine who knows what
-   Memcheck:Cond
-   fun:murrine_draw_expander
-   obj:/usr/lib/x86_64-linux-gnu/gtk-2.0/2.10.0/engines/libmurrine.so
+   obj:/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
+   fun:AES_set_encrypt_key
+   obj:*
 }
 
 {
-   rsvg who knows what
-   Memcheck:Cond
-   obj:/usr/lib/x86_64-linux-gnu/librsvg-2.so.2.40.2
-   fun:rsvg_handle_get_pixbuf_sub
-   obj:/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so
-   fun:gdk_pixbuf_loader_close
-   obj:/usr/lib/x86_64-linux-gnu/libgdk_pixbuf-2.0.so.0.3000.7
-   fun:gdk_pixbuf_new_from_stream_at_scale
-   obj:/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
-   fun:gtk_icon_info_load_icon
-   fun:gtk_icon_theme_load_icon
-   obj:/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
-   obj:/usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0.2400.23
-   obj:/usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0.4002.0
+   Uninitialised value in AES_encrypt
+   Memcheck:Value8
+   obj:/usr/lib/x86_64-linux-gnu/libcrypto.so.1.1
+   fun:AES_encrypt
+   obj:*
+   obj:*
+   obj:*
+   obj:*
 }
-
-- 
2.30.2