[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support
From: |
Daniel P. Berrange |
Subject: |
Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support |
Date: |
Mon, 5 Dec 2016 09:18:42 +0000 |
User-agent: |
Mutt/1.7.1 (2016-10-04) |
On Mon, Dec 05, 2016 at 04:59:38PM +0800, Longpeng(Mike) wrote:
> This patch add standart DES support.
>
> Signed-off-by: Longpeng(Mike) <address@hidden>
> ---
> crypto/cipher-gcrypt.c | 3 +++
> crypto/cipher-nettle.c | 13 ++++++++++---
> crypto/cipher.c | 5 ++++-
> qapi/crypto.json | 2 +-
> 4 files changed, 18 insertions(+), 5 deletions(-)
>
> diff --git a/crypto/cipher-gcrypt.c b/crypto/cipher-gcrypt.c
> index c550db9..7ca049c 100644
> --- a/crypto/cipher-gcrypt.c
> +++ b/crypto/cipher-gcrypt.c
> @@ -28,6 +28,7 @@ bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg,
> QCryptoCipherMode mode)
> {
> switch (alg) {
> + case QCRYPTO_CIPHER_ALG_DES:
> case QCRYPTO_CIPHER_ALG_DES_RFB:
> case QCRYPTO_CIPHER_ALG_AES_128:
> case QCRYPTO_CIPHER_ALG_AES_192:
> @@ -95,6 +96,7 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm
> alg,
> }
>
> switch (alg) {
> + case QCRYPTO_CIPHER_ALG_DES:
> case QCRYPTO_CIPHER_ALG_DES_RFB:
> gcryalg = GCRY_CIPHER_DES;
> break;
> @@ -200,6 +202,7 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm
> alg,
> case QCRYPTO_CIPHER_ALG_TWOFISH_256:
> ctx->blocksize = 16;
> break;
> + case QCRYPTO_CIPHER_ALG_DES:
> case QCRYPTO_CIPHER_ALG_CAST5_128:
> ctx->blocksize = 8;
> break;
> diff --git a/crypto/cipher-nettle.c b/crypto/cipher-nettle.c
> index cd094cd..81cc634 100644
> --- a/crypto/cipher-nettle.c
> +++ b/crypto/cipher-nettle.c
> @@ -196,6 +196,7 @@ bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg,
> QCryptoCipherMode mode)
> {
> switch (alg) {
> + case QCRYPTO_CIPHER_ALG_DES:
> case QCRYPTO_CIPHER_ALG_DES_RFB:
> case QCRYPTO_CIPHER_ALG_AES_128:
> case QCRYPTO_CIPHER_ALG_AES_192:
> @@ -256,11 +257,17 @@ QCryptoCipher
> *qcrypto_cipher_new(QCryptoCipherAlgorithm alg,
> ctx = g_new0(QCryptoCipherNettle, 1);
>
> switch (alg) {
> + case QCRYPTO_CIPHER_ALG_DES:
> case QCRYPTO_CIPHER_ALG_DES_RFB:
> ctx->ctx = g_new0(struct des_ctx, 1);
> - rfbkey = qcrypto_cipher_munge_des_rfb_key(key, nkey);
> - des_set_key(ctx->ctx, rfbkey);
> - g_free(rfbkey);
> +
> + if (alg == QCRYPTO_CIPHER_ALG_DES_RFB) {
> + rfbkey = qcrypto_cipher_munge_des_rfb_key(key, nkey);
> + des_set_key(ctx->ctx, rfbkey);
> + g_free(rfbkey);
> + } else {
> + des_set_key(ctx->ctx, key);
> + }
>
> ctx->alg_encrypt_native = des_encrypt_native;
> ctx->alg_decrypt_native = des_decrypt_native;
> diff --git a/crypto/cipher.c b/crypto/cipher.c
> index a9bca41..00d9682 100644
> --- a/crypto/cipher.c
> +++ b/crypto/cipher.c
> @@ -27,6 +27,7 @@ static size_t alg_key_len[QCRYPTO_CIPHER_ALG__MAX] = {
> [QCRYPTO_CIPHER_ALG_AES_128] = 16,
> [QCRYPTO_CIPHER_ALG_AES_192] = 24,
> [QCRYPTO_CIPHER_ALG_AES_256] = 32,
> + [QCRYPTO_CIPHER_ALG_DES] = 8,
> [QCRYPTO_CIPHER_ALG_DES_RFB] = 8,
> [QCRYPTO_CIPHER_ALG_CAST5_128] = 16,
> [QCRYPTO_CIPHER_ALG_SERPENT_128] = 16,
> @@ -41,6 +42,7 @@ static size_t alg_block_len[QCRYPTO_CIPHER_ALG__MAX] = {
> [QCRYPTO_CIPHER_ALG_AES_128] = 16,
> [QCRYPTO_CIPHER_ALG_AES_192] = 16,
> [QCRYPTO_CIPHER_ALG_AES_256] = 16,
> + [QCRYPTO_CIPHER_ALG_DES] = 8,
> [QCRYPTO_CIPHER_ALG_DES_RFB] = 8,
> [QCRYPTO_CIPHER_ALG_CAST5_128] = 8,
> [QCRYPTO_CIPHER_ALG_SERPENT_128] = 16,
> @@ -107,7 +109,8 @@ qcrypto_cipher_validate_key_length(QCryptoCipherAlgorithm
> alg,
> }
>
> if (mode == QCRYPTO_CIPHER_MODE_XTS) {
> - if (alg == QCRYPTO_CIPHER_ALG_DES_RFB) {
> + if (alg == QCRYPTO_CIPHER_ALG_DES_RFB
> + || alg == QCRYPTO_CIPHER_ALG_DES) {
> error_setg(errp, "XTS mode not compatible with DES-RFB");
> return false;
> }
> diff --git a/qapi/crypto.json b/qapi/crypto.json
> index 5c9d7d4..d403ab9 100644
> --- a/qapi/crypto.json
> +++ b/qapi/crypto.json
> @@ -75,7 +75,7 @@
> { 'enum': 'QCryptoCipherAlgorithm',
> 'prefix': 'QCRYPTO_CIPHER_ALG',
> 'data': ['aes-128', 'aes-192', 'aes-256',
> - 'des-rfb',
> + 'des-rfb', 'des',
Can we call this '3des' to make it clear that this is Triple-DES and not
the single-DES (which des-rfb is)
> 'cast5-128',
> 'serpent-128', 'serpent-192', 'serpent-256',
> 'twofish-128', 'twofish-192', 'twofish-256']}
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|
- [Qemu-devel] [PATCH for-2.9 0/3] crypto: add standard des support, Longpeng(Mike), 2016/12/05
- [Qemu-devel] [PATCH for-2.9 2/3] cryptodev: switch to standard des, Longpeng(Mike), 2016/12/05
- [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Longpeng(Mike), 2016/12/05
- Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support,
Daniel P. Berrange <=
- Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Gonglei (Arei), 2016/12/05
- Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Daniel P. Berrange, 2016/12/05
- Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Gonglei (Arei), 2016/12/05
- Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Daniel P. Berrange, 2016/12/06
- Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Gonglei (Arei), 2016/12/06
- Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Longpeng (Mike), 2016/12/05
- Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Daniel P. Berrange, 2016/12/05
Re: [Qemu-devel] [PATCH for-2.9 1/3] crypto: add standard des support, Eric Blake, 2016/12/05
[Qemu-devel] [PATCH for-2.9 3/3] tests: crypto: add testcase for standard des(ecb), Longpeng(Mike), 2016/12/05