From: John Snow <[email protected]> Signed-off-by: John Snow <[email protected]> Message-ID: <[email protected]> Reviewed-by: Markus Armbruster <[email protected]> [Straightforward semantic conflict with commit bbd049411f (qapi/crypto: Add ECDSA algorithm and curve id) resolved] Signed-off-by: Markus Armbruster <[email protected]> --- qapi/crypto.json | 106 +++++++++++++++++------------------------------ 1 file changed, 38 insertions(+), 68 deletions(-)
diff --git a/qapi/crypto.json b/qapi/crypto.json index cae2c678cb..f8ff87ec0e 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -26,8 +26,7 @@ ## # @QCryptoSecretFormat: -# -# The data format that the secret is provided in +# The data format that the secret is provided in # # @raw: raw bytes. When encoded in JSON only valid UTF-8 sequences # can be used @@ -41,8 +40,7 @@ ## # @QCryptoHashAlgo: -# -# The supported algorithms for computing content digests +# The supported algorithms for computing content digests # # @md5: MD5. Should not be used in any new code, legacy compat only # @@ -68,8 +66,7 @@ ## # @QCryptoCipherAlgo: -# -# The supported algorithms for content encryption ciphers +# The supported algorithms for content encryption ciphers # # @aes-128: AES with 128 bit / 16 byte keys # @@ -110,8 +107,7 @@ ## # @QCryptoCipherMode: -# -# The supported modes for content encryption ciphers +# The supported modes for content encryption ciphers # # @ecb: Electronic Code Book # @@ -150,8 +146,7 @@ ## # @QCryptoBlockFormat: -# -# The supported full disk encryption formats +# The supported full disk encryption formats # # @qcow: QCow/QCow2 built-in AES-CBC encryption. Use only for # liberating data from old images. @@ -165,8 +160,8 @@ ## # @QCryptoBlockOptionsBase: -# -# The common options that apply to all full disk encryption formats +# The common options that apply to all full disk encryption +# formats # # @format: the encryption format # @@ -177,8 +172,7 @@ ## # @QCryptoBlockOptionsQCow: -# -# The options that apply to QCow/QCow2 AES-CBC encryption format +# The options that apply to QCow/QCow2 AES-CBC encryption format # # @key-secret: the ID of a QCryptoSecret object providing the # decryption key. Mandatory except when probing image for @@ -191,8 +185,7 @@ ## # @QCryptoBlockOptionsLUKS: -# -# The options that apply to LUKS encryption format +# The options that apply to LUKS encryption format # # @key-secret: the ID of a QCryptoSecret object providing the # decryption key. Mandatory except when probing image for @@ -205,8 +198,7 @@ ## # @QCryptoBlockCreateOptionsLUKS: -# -# The options that apply to LUKS encryption format initialization +# The options that apply to LUKS encryption format initialization # # @cipher-alg: the cipher algorithm for data encryption. Currently # defaults to 'aes-256'. @@ -239,9 +231,8 @@ ## # @QCryptoBlockOpenOptions: -# -# The options that are available for all encryption formats when -# opening an existing volume +# The options that are available for all encryption formats when +# opening an existing volume # # Since: 2.6 ## @@ -253,9 +244,8 @@ ## # @QCryptoBlockCreateOptions: -# -# The options that are available for all encryption formats when -# initializing a new volume +# The options that are available for all encryption formats when +# initializing a new volume # # Since: 2.6 ## @@ -267,9 +257,8 @@ ## # @QCryptoBlockInfoBase: -# -# The common information that applies to all full disk encryption -# formats +# The common information that applies to all full disk encryption +# formats # # @format: the encryption format # @@ -280,8 +269,7 @@ ## # @QCryptoBlockInfoLUKSSlot: -# -# Information about the LUKS block encryption key slot options +# Information about the LUKS block encryption key slot options # # @active: whether the key slot is currently in use # @@ -301,8 +289,7 @@ ## # @QCryptoBlockInfoLUKS: -# -# Information about the LUKS block encryption options +# Information about the LUKS block encryption options # # @cipher-alg: the cipher algorithm for data encryption # @@ -340,8 +327,7 @@ ## # @QCryptoBlockInfo: -# -# Information about the block encryption options +# Information about the block encryption options # # Since: 2.7 ## @@ -352,8 +338,7 @@ ## # @QCryptoBlockLUKSKeyslotState: -# -# Defines state of keyslots that are affected by the update +# Defines state of keyslots that are affected by the update # # @active: The slots contain the given password and marked as active # @@ -367,9 +352,8 @@ ## # @QCryptoBlockAmendOptionsLUKS: -# -# This struct defines the update parameters that activate/de-activate -# set of keyslots +# This struct defines the update parameters that +# activate/de-activate set of keyslots # # @state: the desired state of the keyslots # @@ -409,9 +393,8 @@ ## # @QCryptoBlockAmendOptions: -# -# The options that are available for all encryption formats when -# amending encryption settings +# The options that are available for all encryption formats when +# amending encryption settings # # Since: 5.1 ## @@ -423,8 +406,7 @@ ## # @SecretCommonProperties: -# -# Properties for objects of classes derived from secret-common. +# Properties for objects of classes derived from secret-common. # # @format: the data format that the secret is provided in # (default: raw) @@ -465,8 +447,7 @@ ## # @SecretKeyringProperties: -# -# Properties for secret_keyring objects. +# Properties for secret_keyring objects. # # @serial: serial number that identifies a key to get from the kernel # @@ -479,8 +460,7 @@ ## # @TlsCredsProperties: -# -# Properties for objects of classes derived from tls-creds. +# Properties for objects of classes derived from tls-creds. # # @verify-peer: if true the peer credentials will be verified once the # handshake is completed. This is a no-op for anonymous @@ -505,8 +485,7 @@ ## # @TlsCredsAnonProperties: -# -# Properties for tls-creds-anon objects. +# Properties for tls-creds-anon objects. # # Since: 2.5 ## @@ -516,8 +495,7 @@ ## # @TlsCredsPskProperties: -# -# Properties for tls-creds-psk objects. +# Properties for tls-creds-psk objects. # # @username: the username which will be sent to the server. For # clients only. If absent, "qemu" is sent and the property will @@ -531,8 +509,7 @@ ## # @TlsCredsX509Properties: -# -# Properties for tls-creds-x509 objects. +# Properties for tls-creds-x509 objects. # # @sanity-check: if true, perform some sanity checks before using the # credentials (default: true) @@ -552,8 +529,7 @@ ## # @QCryptoAkCipherAlgo: -# -# The supported algorithms for asymmetric encryption ciphers +# The supported algorithms for asymmetric encryption ciphers # # @rsa: RSA algorithm # @@ -566,8 +542,7 @@ ## # @QCryptoCurveID: -# -# The supported elliptic curves. +# The supported elliptic curves. # # @prime256v1: NIST P-256 curve (prime256v1) # @@ -580,8 +555,7 @@ ## # @QCryptoAkCipherKeyType: -# -# The type of asymmetric keys. +# The type of asymmetric keys. # # @public: public key # @@ -594,8 +568,7 @@ ## # @QCryptoRSAPaddingAlgo: -# -# The padding algorithm for RSA. +# The padding algorithm for RSA. # # @raw: no padding used # @@ -608,8 +581,7 @@ ## # @QCryptoAkCipherOptionsRSA: -# -# Specific parameters for RSA algorithm. +# Specific parameters for RSA algorithm. # # @hash-alg: `QCryptoHashAlgo` # @@ -623,8 +595,7 @@ ## # @QCryptoAkCipherOptionsECDSA: -# -# Specific parameters for the ECDSA algorithm. +# Specific parameters for the ECDSA algorithm. # # @curve-id: the elliptic curve to use # @@ -635,9 +606,8 @@ ## # @QCryptoAkCipherOptions: -# -# The options that are available for all asymmetric key algorithms -# when creating a new QCryptoAkCipher. +# The options that are available for all asymmetric key algorithms +# when creating a new QCryptoAkCipher. # # @alg: encryption cipher algorithm # -- 2.55.0
