[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/13] crypto: extend unit tests to cover decryption
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/13] crypto: extend unit tests to cover decryption too |
Date: |
Fri, 24 Jul 2015 12:16:25 +0200 |
From: "Daniel P. Berrange" <address@hidden>
The current unit test only verifies the encryption API,
resulting in us missing a recently introduced bug in the
decryption API from commit d3462e3. It was fortunately
later discovered & fixed by commit bd09594, thanks to the
QEMU I/O tests for qcow2 encryption, but we should really
detect this directly in the crypto unit tests. Also remove
an accidental debug message and simplify some asserts.
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/test-crypto-cipher.c | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/tests/test-crypto-cipher.c b/tests/test-crypto-cipher.c
index f9b1a03..9d38d26 100644
--- a/tests/test-crypto-cipher.c
+++ b/tests/test-crypto-cipher.c
@@ -226,12 +226,10 @@ static void test_cipher(const void *opaque)
const QCryptoCipherTestData *data = opaque;
QCryptoCipher *cipher;
- Error *err = NULL;
uint8_t *key, *iv, *ciphertext, *plaintext, *outtext;
size_t nkey, niv, nciphertext, nplaintext;
char *outtexthex;
- g_test_message("foo");
nkey = unhex_string(data->key, &key);
niv = unhex_string(data->iv, &iv);
nciphertext = unhex_string(data->ciphertext, &ciphertext);
@@ -244,28 +242,42 @@ static void test_cipher(const void *opaque)
cipher = qcrypto_cipher_new(
data->alg, data->mode,
key, nkey,
- &err);
+ &error_abort);
g_assert(cipher != NULL);
- g_assert(err == NULL);
if (iv) {
g_assert(qcrypto_cipher_setiv(cipher,
iv, niv,
- &err) == 0);
- g_assert(err == NULL);
+ &error_abort) == 0);
}
g_assert(qcrypto_cipher_encrypt(cipher,
plaintext,
outtext,
nplaintext,
- &err) == 0);
- g_assert(err == NULL);
+ &error_abort) == 0);
outtexthex = hex_string(outtext, nciphertext);
g_assert_cmpstr(outtexthex, ==, data->ciphertext);
+ g_free(outtexthex);
+
+ if (iv) {
+ g_assert(qcrypto_cipher_setiv(cipher,
+ iv, niv,
+ &error_abort) == 0);
+ }
+ g_assert(qcrypto_cipher_decrypt(cipher,
+ ciphertext,
+ outtext,
+ nplaintext,
+ &error_abort) == 0);
+
+ outtexthex = hex_string(outtext, nplaintext);
+
+ g_assert_cmpstr(outtexthex, ==, data->plaintext);
+
g_free(outtext);
g_free(outtexthex);
g_free(key);
--
2.4.3
- [Qemu-devel] [PULL 00/13] Miscellaneous bugfixes for 2.4.0-rc3, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 01/13] exec.c: Use atomic_rcu_read() to access dispatch in memory_region_section_get_iotlb(), Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 03/13] qemu-char: Fix missed data on unix socket, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 02/13] qemu-char: handle EINTR for TCP character devices, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 05/13] vnc: fix memory leak, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 04/13] crypto: extend unit tests to cover decryption too,
Paolo Bonzini <=
- [Qemu-devel] [PULL 07/13] rcu: actually register threads that have RCU read-side critical sections, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 08/13] scsi: Handle no media case for scsi_get_configuration, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 10/13] memory: count number of active VGA logging clients, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 06/13] scsi: fix buffer overflow in scsi_req_parse_cdb (CVE-2015-5158), Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 09/13] vl: Fix compiler warning for builds without VNC, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 12/13] qemu-doc: fix typos, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 11/13] framebuffer: set DIRTY_MEMORY_VGA on RAM that is used for the framebuffer, Paolo Bonzini, 2015/07/24
- [Qemu-devel] [PULL 13/13] target-i386/FPU: a misprint in helper_fistll_ST0, Paolo Bonzini, 2015/07/24
- Re: [Qemu-devel] [PULL 00/13] Miscellaneous bugfixes for 2.4.0-rc3, Peter Maydell, 2015/07/24