| Message ID | 20240311121929.212472-4-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | crypto: handle gcrypt ciphers being disabled | expand |
On 11/03/2024 13.19, Daniel P. Berrangé wrote: > 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); Reviewed-by: Thomas Huth <thuth@redhat.com>
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);
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(-)