[Qemu-commits] [qemu/qemu] f84483: crypto: extend mode as a parameter in qcrypto_ciph...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f844836ddccf3dbcba142128da5dd8ee618f3e91
      
https://github.com/qemu/qemu/commit/f844836ddccf3dbcba142128da5dd8ee618f3e91
  Author: Gonglei <address@hidden>
  Date:   2016-10-19 (Wed, 19 Oct 2016)

  Changed paths:
    M block/qcow.c
    M block/qcow2.c
    M crypto/cipher-builtin.c
    M crypto/cipher-gcrypt.c
    M crypto/cipher-nettle.c
    M include/crypto/cipher.h
    M tests/test-crypto-cipher.c
    M ui/vnc.c

  Log Message:
  -----------
  crypto: extend mode as a parameter in qcrypto_cipher_supports()

It can't guarantee all cipher modes are supported
if one cipher algorithm is supported by a backend.
Let's extend qcrypto_cipher_supports() to take both
the algorithm and mode as parameters.

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


  Commit: 3c28292f390f642bbb3dba0949ecf36aaf7be0d6
      
https://github.com/qemu/qemu/commit/3c28292f390f642bbb3dba0949ecf36aaf7be0d6
  Author: Gonglei <address@hidden>
  Date:   2016-10-19 (Wed, 19 Oct 2016)

  Changed paths:
    M crypto/cipher-gcrypt.c
    M crypto/cipher-nettle.c
    M crypto/cipher.c
    M include/crypto/cipher.h
    M qapi/crypto.json
    M tests/test-crypto-cipher.c

  Log Message:
  -----------
  crypto: add CTR mode support

Introduce CTR mode support for the cipher APIs.
CTR mode uses a counter rather than a traditional IV.
The counter has additional properties, including a nonce
and initial counter block. We reuse the ctx->iv as
the counter for conveniences.

Both libgcrypt and nettle are support CTR mode, the
cipher-builtin doesn't support yet.

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


  Commit: 77cf26cd89c6e6947fe856a079061cebaecd5435
      
https://github.com/qemu/qemu/commit/77cf26cd89c6e6947fe856a079061cebaecd5435
  Author: Gonglei <address@hidden>
  Date:   2016-10-19 (Wed, 19 Oct 2016)

  Changed paths:
    M crypto/cipher-builtin.c

  Log Message:
  -----------
  crypto: add mode check in qcrypto_cipher_new() for cipher-builtin

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


  Commit: 48b95ea4f0933c13d778c0478cb82bbfdd515981
      
https://github.com/qemu/qemu/commit/48b95ea4f0933c13d778c0478cb82bbfdd515981
  Author: Gonglei <address@hidden>
  Date:   2016-10-19 (Wed, 19 Oct 2016)

  Changed paths:
    M tests/pkix_asn1_tab.c

  Log Message:
  -----------
  qtest: fix make check complaint in crypto module

  CC    tests/test-crypto-tlscredsx509.o
  CC    tests/crypto-tls-x509-helpers.o
  CC    tests/pkix_asn1_tab.o
tests/pkix_asn1_tab.c:7:22: warning: libtasn1.h: No such file or directory
tests/pkix_asn1_tab.c:9: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or 
‘__attribute__’ before ‘pkix_asn1_tab’
make: *** [tests/pkix_asn1_tab.o] Error 1

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


  Commit: d26d6b5d34f825c452f9bf3c9d5126181b10f25b
      
https://github.com/qemu/qemu/commit/d26d6b5d34f825c452f9bf3c9d5126181b10f25b
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-19 (Wed, 19 Oct 2016)

  Changed paths:
    M tests/test-crypto-hash.c
    M tests/test-io-channel-tls.c

  Log Message:
  -----------
  crypto: fix initialization of crypto in tests

The test-io-channel-tls test was missing a call to qcrypto_init
and test-crypto-hash was initializing it multiple times,

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


  Commit: 373166636b9f07c60d7c32610bd346acf7d143e9
      
https://github.com/qemu/qemu/commit/373166636b9f07c60d7c32610bd346acf7d143e9
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M crypto/init.c

  Log Message:
  -----------
  crypto: fix initialization of gcrypt threading

The gcrypt threads implementation must be set before calling
any other gcrypt APIs, especially gcry_check_version(),
since that triggers initialization of the random pool. After
that is initialized, changes to the threads impl won't be
honoured by the random pool code. This means that gcrypt
will think thread locking is needed and so try to acquire
the random pool mutex, but this is NULL as no threads impl
was set originally. This results in a crash in the random
pool code.

For the same reasons, we must set the gcrypt threads impl
before calling gnutls_init, since that will also trigger
gcry_check_version

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


  Commit: da158a86c407fa7b9da848b571356a26809d8df9
      
https://github.com/qemu/qemu/commit/da158a86c407fa7b9da848b571356a26809d8df9
  Author: Peter Maydell <address@hidden>
  Date:   2016-10-20 (Thu, 20 Oct 2016)

  Changed paths:
    M block/qcow.c
    M block/qcow2.c
    M crypto/cipher-builtin.c
    M crypto/cipher-gcrypt.c
    M crypto/cipher-nettle.c
    M crypto/cipher.c
    M crypto/init.c
    M include/crypto/cipher.h
    M qapi/crypto.json
    M tests/pkix_asn1_tab.c
    M tests/test-crypto-cipher.c
    M tests/test-crypto-hash.c
    M tests/test-io-channel-tls.c
    M ui/vnc.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/berrange/tags/pull-qcrypto-2016-10-20-1' into staging

Merge qcrypto 2016/10/20 v1

# gpg: Signature made Thu 20 Oct 2016 12:58:41 BST
# 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-2016-10-20-1:
  crypto: fix initialization of gcrypt threading
  crypto: fix initialization of crypto in tests
  qtest: fix make check complaint in crypto module
  crypto: add mode check in qcrypto_cipher_new() for cipher-builtin
  crypto: add CTR mode support
  crypto: extend mode as a parameter in qcrypto_cipher_supports()

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


Compare: https://github.com/qemu/qemu/compare/1b0d3845b454...da158a86c407