qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Daniel P. Berrangé" <berrange@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>
Subject: [PATCH 3/4] crypto: use error_abort for unexpected failures
Date: Mon, 11 Mar 2024 12:19:28 +0000	[thread overview]
Message-ID: <20240311121929.212472-4-berrange@redhat.com> (raw)
In-Reply-To: <20240311121929.212472-1-berrange@redhat.com>

This improves the error diagnosis from the unit test when a cipher
is unexpected not available from

ERROR:../tests/unit/test-crypto-cipher.c:683:test_cipher: assertion failed: (err == NULL)
Bail out! ERROR:../tests/unit/test-crypto-cipher.c:683:test_cipher: assertion failed: (err == NULL)
Aborted (core dumped)

to

Unexpected error in qcrypto_cipher_ctx_new() at ../crypto/cipher-gcrypt.c.inc:262:
./build//tests/unit/test-crypto-cipher: Cannot initialize cipher: Invalid cipher algorithm
Aborted (core dumped)

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 tests/unit/test-crypto-cipher.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/unit/test-crypto-cipher.c b/tests/unit/test-crypto-cipher.c
index 11ab1a54fc..d0ea7b4d8e 100644
--- a/tests/unit/test-crypto-cipher.c
+++ b/tests/unit/test-crypto-cipher.c
@@ -676,9 +676,8 @@ static void test_cipher(const void *opaque)
     cipher = qcrypto_cipher_new(
         data->alg, data->mode,
         key, nkey,
-        &err);
+        data->plaintext ? &error_abort : &err);
     if (data->plaintext) {
-        g_assert(err == NULL);
         g_assert(cipher != NULL);
     } else {
         error_free_or_abort(&err);
-- 
2.43.0



  parent reply	other threads:[~2024-03-11 12:20 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-11 12:19 [PATCH 0/4] crypto: handle gcrypt ciphers being disabled Daniel P. Berrangé
2024-03-11 12:19 ` [PATCH 1/4] crypto: factor out conversion of QAPI to gcrypt constants Daniel P. Berrangé
2024-03-11 16:04   ` Thomas Huth
2024-03-11 12:19 ` [PATCH 2/4] crypto: query gcrypt for cipher availability Daniel P. Berrangé
2024-03-11 16:16   ` Thomas Huth
2024-03-11 12:19 ` Daniel P. Berrangé [this message]
2024-03-11 16:19   ` [PATCH 3/4] crypto: use error_abort for unexpected failures Thomas Huth
2024-03-11 12:19 ` [PATCH 4/4] crypto: report which ciphers are being skipped during tests Daniel P. Berrangé
2024-03-11 16:20   ` Thomas Huth
2024-03-11 14:15 ` [PATCH 0/4] crypto: handle gcrypt ciphers being disabled Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240311121929.212472-4-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).