Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-02-27-1' into...
commit8f2d7c341184a95d05476ea3c45dbae2b9ddbe51
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 27 Feb 2017 15:33:21 +0000 (27 15:33 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 27 Feb 2017 15:33:21 +0000 (27 15:33 +0000)
tree67fd2ff194962236b766e7d4d942f47213f5903d
parent3b1d8169844fafee184366b0e0d7080534758b4d
parent32c813e6c2a857b93b897901b7e20281397528a3
Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-02-27-1' into staging

Merge qcrypto 2017/02/27 v1

# gpg: Signature made Mon 27 Feb 2017 13:37:34 GMT
# gpg:                using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E  8E3F BE86 EBB4 1510 4FDF

* remotes/berrange/tags/pull-qcrypto-2017-02-27-1:
  crypto: assert cipher algorithm is always valid
  crypto: fix leak in ivgen essiv init

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>