diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-10-20 14:46:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-10-20 14:46:19 +0100 |
| commit | da158a86c407fa7b9da848b571356a26809d8df9 (patch) | |
| tree | 7eed17b46e5b626df8c96a5897129d73c57b4b52 /qapi | |
| parent | 1b0d3845b454eaaac0b2064c78926ca4d739a080 (diff) | |
| parent | 373166636b9f07c60d7c32610bd346acf7d143e9 (diff) | |
| download | focaccia-qemu-da158a86c407fa7b9da848b571356a26809d8df9.tar.gz focaccia-qemu-da158a86c407fa7b9da848b571356a26809d8df9.zip | |
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 <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-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 <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/crypto.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qapi/crypto.json b/qapi/crypto.json index 6933b13bd0..5c9d7d4a36 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -89,11 +89,12 @@ # @ecb: Electronic Code Book # @cbc: Cipher Block Chaining # @xts: XEX with tweaked code book and ciphertext stealing +# @ctr: Counter (Since 2.8) # Since: 2.6 ## { 'enum': 'QCryptoCipherMode', 'prefix': 'QCRYPTO_CIPHER_MODE', - 'data': ['ecb', 'cbc', 'xts']} + 'data': ['ecb', 'cbc', 'xts', 'ctr']} ## |