Commit b79fbb2d authored Mar 23, 2017 by Peter Maydell

Merge remote-tracking branch 'remotes/gonglei/tags/cryptodev-next-20170323' into staging



cryptodev fixes

# gpg: Signature made Thu 23 Mar 2017 09:22:44 GMT
# gpg:                using RSA key 0x2ED7FDE9063C864D
# gpg: Good signature from "Gonglei <arei.gonglei@huawei.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 3EF1 8E53 3459 E6D1 963A  3C05 2ED7 FDE9 063C 864D

* remotes/gonglei/tags/cryptodev-next-20170323:
  cryptodev: fix asserting single queue
  cryptodev: setiv only when really need

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

parents d81d857f b7bad50a

backends/cryptodev-builtin.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -320,11 +320,13 @@ static int cryptodev_builtin_sym_operation(

		sess = builtin->sessions[op_info->session_id];

		if (op_info->iv_len > 0) {
		ret = qcrypto_cipher_setiv(sess->cipher, op_info->iv,
		op_info->iv_len, errp);
		if (ret < 0) {
		return -VIRTIO_CRYPTO_ERR;
		}
		}

		if (sess->direction == VIRTIO_CRYPTO_OP_ENCRYPT) {
		ret = qcrypto_cipher_encrypt(sess->cipher, op_info->src,
		@@ -359,8 +361,6 @@ static void cryptodev_builtin_cleanup(
		}
		}

		assert(queues == 1);

		for (i = 0; i < queues; i++) {
		cc = backend->conf.peers.ccs[i];
		if (cc) {