diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-12-13 18:45:18 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-12-13 18:45:18 +0000 |
| commit | d8d5fefd8657d4f7b380b3a1533340434b5b9def (patch) | |
| tree | 24c2b02e6117625f2d3385c91c6226306e1be549 /qapi | |
| parent | 2d894e48362ad2a576fca929dcca1787f43a8af6 (diff) | |
| parent | c972fa123c73501b4b0c6de7873754ea3205a5eb (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
Merge crypto patches 2018/12/12
- Fix documentation about default LUKS algorithms
- Support for multi-threaded block crypto
# gpg: Signature made Wed 12 Dec 2018 11:21:52 GMT
# gpg: using RSA key BE86EBB415104FDF
# 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/qcrypto-next-pull-request:
crypto: support multiple threads accessing one QCryptoBlock
crypto/block: introduce qcrypto_block_*crypt_helper functions
crypto/block: rename qcrypto_block_*crypt_helper
crypto/block: refactor qcrypto_block_*crypt_helper functions
crypto/block-luks: fix memory leak in qcrypto_block_luks_create
crypto: Fix defaults in QCryptoBlockCreateOptionsLUKS
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
| -rw-r--r-- | qapi/crypto.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qapi/crypto.json b/qapi/crypto.json index a51b434412..b2a4cff683 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -181,11 +181,11 @@ # The options that apply to LUKS encryption format initialization # # @cipher-alg: the cipher algorithm for data encryption -# Currently defaults to 'aes'. +# Currently defaults to 'aes-256'. # @cipher-mode: the cipher mode for data encryption -# Currently defaults to 'cbc' +# Currently defaults to 'xts' # @ivgen-alg: the initialization vector generator -# Currently defaults to 'essiv' +# Currently defaults to 'plain64' # @ivgen-hash-alg: the initialization vector generator hash # Currently defaults to 'sha256' # @hash-alg: the master key hash algorithm |