From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 4 Aug 2016 16:39:56 +0000 (+0300)
Subject: lib-dcrypt: Skip checks if no backend found
X-Git-Tag: 2.2.26~425
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=baf8f0ae55f88ee8399b39ad43d07aa659be65ad;p=thirdparty%2Fdovecot%2Fcore.git

lib-dcrypt: Skip checks if no backend found
---

diff --git a/src/lib-dcrypt/test-crypto.c b/src/lib-dcrypt/test-crypto.c
index 1eb9150e00..401c38ad56 100644
--- a/src/lib-dcrypt/test-crypto.c
+++ b/src/lib-dcrypt/test-crypto.c
@@ -619,7 +619,10 @@ void test_load_invalid_keys(void) {
 
 int main(void) {
 	random_init();
-	dcrypt_initialize("openssl", NULL, NULL);
+	if (!dcrypt_initialize(NULL, NULL, NULL)) {
+		i_error("No functional dcrypt backend found - skipping tests");
+		return 0;
+	}
 
 	static void (*test_functions[])(void) = {
 		test_cipher_test_vectors,
diff --git a/src/lib-dcrypt/test-stream.c b/src/lib-dcrypt/test-stream.c
index 2cc2d7ebeb..00dfe0610d 100644
--- a/src/lib-dcrypt/test-stream.c
+++ b/src/lib-dcrypt/test-stream.c
@@ -424,7 +424,10 @@ void test_free_keys() {
 }
 
 int main(void) {
-	dcrypt_initialize("openssl", NULL, NULL);
+	if (!dcrypt_initialize(NULL, NULL, NULL)) {
+		i_error("No functional dcrypt backend found - skipping tests");
+		return 0;
+	}
 	random_init();
 
 	test_assert(dcrypt_key_load_private(&test_v1_kp.priv, key_v1_priv, NULL, NULL, NULL));