summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules1
m---------3rdparty/cmocka0
-rw-r--r--tests/lib/b64_decode-test.c2
3 files changed, 2 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 68230b92edf9..69aa470ea6ae 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -48,6 +48,7 @@
path = 3rdparty/cmocka
url = ../cmocka.git
update = none
+ branch = stable-1.1
[submodule "3rdparty/qc_blobs"]
path = 3rdparty/qc_blobs
url = ../qc_blobs.git
diff --git a/3rdparty/cmocka b/3rdparty/cmocka
-Subproject 672c5cee79eb412025c3dd8b034e611c1f11905
+Subproject 8931845c35e78b5123d73430b071affd537d593
diff --git a/tests/lib/b64_decode-test.c b/tests/lib/b64_decode-test.c
index 631dc15f7d0e..189ce9623779 100644
--- a/tests/lib/b64_decode-test.c
+++ b/tests/lib/b64_decode-test.c
@@ -35,7 +35,7 @@ static void test_b64_decode(void **state)
res = b64_decode((uint8_t *)messages[i].enc, strlen(messages[i].enc), decoded);
assert_int_equal(res, (strlen(messages[i].dec)));
- assert_string_equal(decoded, messages[i].dec);
+ assert_string_equal((const char *)decoded, messages[i].dec);
free(decoded);
}