[Qemu-commits] [qemu/qemu] b417a7: tests: Run the luks tests in test-crypto-block onl...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b417a7624c67a1544f8b6afe3de1a18fc380746e
      
https://github.com/qemu/qemu/commit/b417a7624c67a1544f8b6afe3de1a18fc380746e
  Author: Thomas Huth <address@hidden>
  Date:   2017-11-08 (Wed, 08 Nov 2017)

  Changed paths:
    M tests/test-crypto-block.c

  Log Message:
  -----------
  tests: Run the luks tests in test-crypto-block only if encryption is available

The test-crypto-block currently fails if encryption has not been
compiled into QEMU:

TEST: tests/test-crypto-block... (pid=22231)
  /crypto/block/qcow:                                                  OK
  /crypto/block/luks/default:
  Unexpected error in qcrypto_pbkdf2() at qemu/crypto/pbkdf-stub.c:41:
FAIL
GTester: last random seed: R02Sbbb5b6f299c6727f41bb50ba4aa6ef5c
(pid=22237)
  /crypto/block/luks/aes-256-cbc-plain64:
  Unexpected error in qcrypto_pbkdf2() at qemu/crypto/pbkdf-stub.c:41:
FAIL
GTester: last random seed: R02S3e27992a5ab4cc95e141c4ed3c7f0d2e
(pid=22239)
  /crypto/block/luks/aes-256-cbc-essiv:
  Unexpected error in qcrypto_pbkdf2() at qemu/crypto/pbkdf-stub.c:41:
FAIL
GTester: last random seed: R02S51b52bb02a66c42d8b331fd305384f53
(pid=22241)
FAIL: tests/test-crypto-block

So run the luks test only if the required encryption support is available.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: f1710638edb2e98008c2a733ffda63ef32b50411
      
https://github.com/qemu/qemu/commit/f1710638edb2e98008c2a733ffda63ef32b50411
  Author: Longpeng <address@hidden>
  Date:   2017-11-08 (Wed, 08 Nov 2017)

  Changed paths:
    M crypto/cipher.c
    M crypto/hash.c
    M crypto/hmac.c

  Log Message:
  -----------
  crypto: afalg: fix a NULL pointer dereference

Test-crypto-hash calls qcrypto_hash_bytesv/digest/base64 with
errp=NULL, this will cause a NULL pointer dereference if afalg_driver
doesn't support requested algos:

    ret = qcrypto_hash_afalg_driver.hash_bytesv(alg, iov, niov,
                                          result, resultlen,
                                          errp);
    if (ret == 0) {
  return ret;
    }

    error_free(*errp);  // <--- here

Because the error message is thrown away immediately, we should
just pass NULL to hash_bytesv(). There is also the same problem in
afalg-backend cipher & hmac, let's fix them together.

Reviewed-by: Eric Blake <address@hidden>
Reported-by: Paolo Bonzini <address@hidden>
Signed-off-by: Longpeng <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>


  Commit: 4ffa88c99c54d2a30f79e3dbecec50b023eff1c8
      
https://github.com/qemu/qemu/commit/4ffa88c99c54d2a30f79e3dbecec50b023eff1c8
  Author: Peter Maydell <address@hidden>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M crypto/cipher.c
    M crypto/hash.c
    M crypto/hmac.c
    M tests/test-crypto-block.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/berrange/tags/pull-qcrypto-2017-11-08-1' into staging

Merge qcrypto 2017/11/08 v1

# gpg: Signature made Wed 08 Nov 2017 11:06:38 GMT
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <address@hidden>"
# gpg:                 aka "Daniel P. Berrange <address@hidden>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qcrypto-2017-11-08-1:
  crypto: afalg: fix a NULL pointer dereference
  tests: Run the luks tests in test-crypto-block only if encryption is available

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/6058bfb00a7b...4ffa88c99c54