summaryrefslogtreecommitdiff
path: root/qapi/crypto.json
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2016-02-10 17:07:42 +0000
committerDaniel P. Berrange <berrange@redhat.com>2016-03-17 14:41:15 +0000
commit94318522ed7930863924b3191ea8fee1d8cbe506 (patch)
treea403464d7a4ab7853628ea9891f5c05fe671fcf2 /qapi/crypto.json
parent084a85eeddfe1ab84b861971b6efd976d2ae3d1f (diff)
downloadqemu-94318522ed7930863924b3191ea8fee1d8cbe506.tar.gz
crypto: add support for the serpent cipher algorithm
New cipher algorithms 'serpent-128', 'serpent-192' and 'serpent-256' are defined for the Serpent algorithm. The nettle and gcrypt cipher backends are updated to support the new cipher and a test vector added to the cipher test suite. The new algorithm is enabled in the LUKS block encryption driver. Reviewed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Diffstat (limited to 'qapi/crypto.json')
-rw-r--r--qapi/crypto.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/qapi/crypto.json b/qapi/crypto.json
index 0550ee7803..6738b950a6 100644
--- a/qapi/crypto.json
+++ b/qapi/crypto.json
@@ -60,13 +60,17 @@
# @aes-256: AES with 256 bit / 32 byte keys
# @des-rfb: RFB specific variant of single DES. Do not use except in VNC.
# @cast5-128: Cast5 with 128 bit / 16 byte keys
+# @serpent-128: Serpent with 128 bit / 16 byte keys
+# @serpent-192: Serpent with 192 bit / 24 byte keys
+# @serpent-256: Serpent with 256 bit / 32 byte keys
# Since: 2.6
##
{ 'enum': 'QCryptoCipherAlgorithm',
'prefix': 'QCRYPTO_CIPHER_ALG',
'data': ['aes-128', 'aes-192', 'aes-256',
'des-rfb',
- 'cast5-128']}
+ 'cast5-128',
+ 'serpent-128', 'serpent-192', 'serpent-256']}
##