Commit da158a86 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1b0d3845 37316663

block/qcow.c

+2 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, 
        ret = -EINVAL;

        goto fail;

    }

    if (!qcrypto_cipher_supports(QCRYPTO_CIPHER_ALG_AES_128)) {

    if (!qcrypto_cipher_supports(QCRYPTO_CIPHER_ALG_AES_128,

                                 QCRYPTO_CIPHER_MODE_CBC)) {

        error_setg(errp, "AES cipher not available");

        ret = -EINVAL;

        goto fail;

block/qcow2.c

+2 −1
Original line number Diff line number Diff line
@@ -959,7 +959,8 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, 
        ret = -EINVAL;

        goto fail;

    }

    if (!qcrypto_cipher_supports(QCRYPTO_CIPHER_ALG_AES_128)) {

    if (!qcrypto_cipher_supports(QCRYPTO_CIPHER_ALG_AES_128,

                                 QCRYPTO_CIPHER_MODE_CBC)) {

        error_setg(errp, "AES cipher not available");

        ret = -EINVAL;

        goto fail;

crypto/cipher-builtin.c

+24 −1
Original line number Diff line number Diff line
@@ -400,14 +400,26 @@ static int qcrypto_cipher_init_des_rfb(QCryptoCipher *cipher, 
}





bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg)

bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg,

                             QCryptoCipherMode mode)

{

    switch (alg) {

    case QCRYPTO_CIPHER_ALG_DES_RFB:

    case QCRYPTO_CIPHER_ALG_AES_128:

    case QCRYPTO_CIPHER_ALG_AES_192:

    case QCRYPTO_CIPHER_ALG_AES_256:

        break;

    default:

        return false;

    }



    switch (mode) {

    case QCRYPTO_CIPHER_MODE_ECB:

    case QCRYPTO_CIPHER_MODE_CBC:

    case QCRYPTO_CIPHER_MODE_XTS:

        return true;

    case QCRYPTO_CIPHER_MODE_CTR:

        return false;

    default:

        return false;

    }
@@ -421,6 +433,17 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
{

    QCryptoCipher *cipher;



    switch (mode) {

    case QCRYPTO_CIPHER_MODE_ECB:

    case QCRYPTO_CIPHER_MODE_CBC:

    case QCRYPTO_CIPHER_MODE_XTS:

        break;

    default:

        error_setg(errp, "Unsupported cipher mode %s",

                   QCryptoCipherMode_lookup[mode]);

        return NULL;

    }



    cipher = g_new0(QCryptoCipher, 1);

    cipher->alg = alg;

    cipher->mode = mode;

crypto/cipher-gcrypt.c

+31 −7
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
#include <gcrypt.h>





bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg)

bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg,

                             QCryptoCipherMode mode)

{

    switch (alg) {

    case QCRYPTO_CIPHER_ALG_DES_RFB:
@@ -37,6 +38,16 @@ bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg) 
    case QCRYPTO_CIPHER_ALG_SERPENT_256:

    case QCRYPTO_CIPHER_ALG_TWOFISH_128:

    case QCRYPTO_CIPHER_ALG_TWOFISH_256:

        break;

    default:

        return false;

    }



    switch (mode) {

    case QCRYPTO_CIPHER_MODE_ECB:

    case QCRYPTO_CIPHER_MODE_CBC:

    case QCRYPTO_CIPHER_MODE_XTS:

    case QCRYPTO_CIPHER_MODE_CTR:

        return true;

    default:

        return false;
@@ -48,6 +59,7 @@ struct QCryptoCipherGcrypt { 
    gcry_cipher_hd_t handle;

    gcry_cipher_hd_t tweakhandle;

    size_t blocksize;

    /* Initialization vector or Counter */

    uint8_t *iv;

};
@@ -69,6 +81,9 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
    case QCRYPTO_CIPHER_MODE_CBC:

        gcrymode = GCRY_CIPHER_MODE_CBC;

        break;

    case QCRYPTO_CIPHER_MODE_CTR:

        gcrymode = GCRY_CIPHER_MODE_CTR;

        break;

    default:

        error_setg(errp, "Unsupported cipher mode %s",

                   QCryptoCipherMode_lookup[mode]);
@@ -338,6 +353,14 @@ int qcrypto_cipher_setiv(QCryptoCipher *cipher, 


    if (ctx->iv) {

        memcpy(ctx->iv, iv, niv);

    } else {

        if (cipher->mode == QCRYPTO_CIPHER_MODE_CTR) {

            err = gcry_cipher_setctr(ctx->handle, iv, niv);

            if (err != 0) {

                error_setg(errp, "Cannot set Counter: %s",

                       gcry_strerror(err));

                return -1;

            }

        } else {

            gcry_cipher_reset(ctx->handle);

            err = gcry_cipher_setiv(ctx->handle, iv, niv);
@@ -347,6 +370,7 @@ int qcrypto_cipher_setiv(QCryptoCipher *cipher, 
                return -1;

            }

        }

    }



    return 0;

}

crypto/cipher-nettle.c

+26 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <nettle/cast128.h>

#include <nettle/serpent.h>

#include <nettle/twofish.h>

#include <nettle/ctr.h>



typedef void (*QCryptoCipherNettleFuncWrapper)(const void *ctx,

                                               size_t length,
@@ -186,12 +187,13 @@ struct QCryptoCipherNettle { 
    QCryptoCipherNettleFuncNative alg_decrypt_native;

    QCryptoCipherNettleFuncWrapper alg_encrypt_wrapper;

    QCryptoCipherNettleFuncWrapper alg_decrypt_wrapper;



    /* Initialization vector or Counter */

    uint8_t *iv;

    size_t blocksize;

};



bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg)

bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg,

                             QCryptoCipherMode mode)

{

    switch (alg) {

    case QCRYPTO_CIPHER_ALG_DES_RFB:
@@ -205,6 +207,16 @@ bool qcrypto_cipher_supports(QCryptoCipherAlgorithm alg) 
    case QCRYPTO_CIPHER_ALG_TWOFISH_128:

    case QCRYPTO_CIPHER_ALG_TWOFISH_192:

    case QCRYPTO_CIPHER_ALG_TWOFISH_256:

        break;

    default:

        return false;

    }



    switch (mode) {

    case QCRYPTO_CIPHER_MODE_ECB:

    case QCRYPTO_CIPHER_MODE_CBC:

    case QCRYPTO_CIPHER_MODE_XTS:

    case QCRYPTO_CIPHER_MODE_CTR:

        return true;

    default:

        return false;
@@ -225,6 +237,7 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
    case QCRYPTO_CIPHER_MODE_ECB:

    case QCRYPTO_CIPHER_MODE_CBC:

    case QCRYPTO_CIPHER_MODE_XTS:

    case QCRYPTO_CIPHER_MODE_CTR:

        break;

    default:

        error_setg(errp, "Unsupported cipher mode %s",
@@ -430,6 +443,12 @@ int qcrypto_cipher_encrypt(QCryptoCipher *cipher, 
                    ctx->iv, len, out, in);

        break;



    case QCRYPTO_CIPHER_MODE_CTR:

        ctr_crypt(ctx->ctx, ctx->alg_encrypt_native,

                    ctx->blocksize, ctx->iv,

                    len, out, in);

        break;



    default:

        error_setg(errp, "Unsupported cipher mode %s",

                   QCryptoCipherMode_lookup[cipher->mode]);
@@ -469,6 +488,11 @@ int qcrypto_cipher_decrypt(QCryptoCipher *cipher, 
                    ctx->alg_encrypt_wrapper, ctx->alg_decrypt_wrapper,

                    ctx->iv, len, out, in);

        break;

    case QCRYPTO_CIPHER_MODE_CTR:

        ctr_crypt(ctx->ctx, ctx->alg_encrypt_native,

                    ctx->blocksize, ctx->iv,

                    len, out, in);

        break;



    default:

        error_setg(errp, "Unsupported cipher mode %s",