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

Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2016-09-12-1' into staging 



Merge qcrypto 2016/09/12 v1

# gpg: Signature made Mon 12 Sep 2016 12:02:20 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-09-12-1:
  crypto: report enum strings instead of values in errors
  crypto: fix building complaint
  crypto: ensure XTS is only used with ciphers with 16 byte blocks

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c569c537 90d6f60d

crypto/block.c

+4 −2
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ QCryptoBlock *qcrypto_block_open(QCryptoBlockOpenOptions *options, 


    if (options->format >= G_N_ELEMENTS(qcrypto_block_drivers) ||

        !qcrypto_block_drivers[options->format]) {

        error_setg(errp, "Unsupported block driver %d", options->format);

        error_setg(errp, "Unsupported block driver %s",

                   QCryptoBlockFormat_lookup[options->format]);

        g_free(block);

        return NULL;

    }
@@ -88,7 +89,8 @@ QCryptoBlock *qcrypto_block_create(QCryptoBlockCreateOptions *options, 


    if (options->format >= G_N_ELEMENTS(qcrypto_block_drivers) ||

        !qcrypto_block_drivers[options->format]) {

        error_setg(errp, "Unsupported block driver %d", options->format);

        error_setg(errp, "Unsupported block driver %s",

                   QCryptoBlockFormat_lookup[options->format]);

        g_free(block);

        return NULL;

    }

crypto/cipher-builtin.c

+6 −3
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ static int qcrypto_cipher_init_aes(QCryptoCipher *cipher, 
    if (cipher->mode != QCRYPTO_CIPHER_MODE_CBC &&

        cipher->mode != QCRYPTO_CIPHER_MODE_ECB &&

        cipher->mode != QCRYPTO_CIPHER_MODE_XTS) {

        error_setg(errp, "Unsupported cipher mode %d", cipher->mode);

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

                   QCryptoCipherMode_lookup[cipher->mode]);

        return -1;

    }
@@ -376,7 +377,8 @@ static int qcrypto_cipher_init_des_rfb(QCryptoCipher *cipher, 
    QCryptoCipherBuiltin *ctxt;



    if (cipher->mode != QCRYPTO_CIPHER_MODE_ECB) {

        error_setg(errp, "Unsupported cipher mode %d", cipher->mode);

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

                   QCryptoCipherMode_lookup[cipher->mode]);

        return -1;

    }
@@ -442,7 +444,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
        break;

    default:

        error_setg(errp,

                   "Unsupported cipher algorithm %d", cipher->alg);

                   "Unsupported cipher algorithm %s",

                   QCryptoCipherAlgorithm_lookup[cipher->alg]);

        goto error;

    }

crypto/cipher-gcrypt.c

+10 −2
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
        gcrymode = GCRY_CIPHER_MODE_CBC;

        break;

    default:

        error_setg(errp, "Unsupported cipher mode %d", mode);

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

                   QCryptoCipherMode_lookup[mode]);

        return NULL;

    }
@@ -120,7 +121,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
        break;



    default:

        error_setg(errp, "Unsupported cipher algorithm %d", alg);

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

                   QCryptoCipherAlgorithm_lookup[alg]);

        return NULL;

    }
@@ -192,6 +194,12 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
    }



    if (cipher->mode == QCRYPTO_CIPHER_MODE_XTS) {

        if (ctx->blocksize != XTS_BLOCK_SIZE) {

            error_setg(errp,

                       "Cipher block size %zu must equal XTS block size %d",

                       ctx->blocksize, XTS_BLOCK_SIZE);

            goto error;

        }

        ctx->iv = g_new0(uint8_t, ctx->blocksize);

    }

crypto/cipher-nettle.c

+15 −11
Original line number Diff line number Diff line
@@ -227,7 +227,8 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
    case QCRYPTO_CIPHER_MODE_XTS:

        break;

    default:

        error_setg(errp, "Unsupported cipher mode %d", mode);

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

                   QCryptoCipherMode_lookup[mode]);

        return NULL;

    }
@@ -357,7 +358,15 @@ QCryptoCipher *qcrypto_cipher_new(QCryptoCipherAlgorithm alg, 
        break;



    default:

        error_setg(errp, "Unsupported cipher algorithm %d", alg);

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

                   QCryptoCipherAlgorithm_lookup[alg]);

        goto error;

    }



    if (mode == QCRYPTO_CIPHER_MODE_XTS &&

        ctx->blocksize != XTS_BLOCK_SIZE) {

        error_setg(errp, "Cipher block size %zu must equal XTS block size %d",

                   ctx->blocksize, XTS_BLOCK_SIZE);

        goto error;

    }
@@ -422,8 +431,8 @@ int qcrypto_cipher_encrypt(QCryptoCipher *cipher, 
        break;



    default:

        error_setg(errp, "Unsupported cipher algorithm %d",

                   cipher->alg);

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

                   QCryptoCipherMode_lookup[cipher->mode]);

        return -1;

    }

    return 0;
@@ -456,19 +465,14 @@ int qcrypto_cipher_decrypt(QCryptoCipher *cipher, 
        break;



    case QCRYPTO_CIPHER_MODE_XTS:

        if (ctx->blocksize != XTS_BLOCK_SIZE) {

            error_setg(errp, "Block size must be %d not %zu",

                       XTS_BLOCK_SIZE, ctx->blocksize);

            return -1;

        }

        xts_decrypt(ctx->ctx, ctx->ctx_tweak,

                    ctx->alg_encrypt_wrapper, ctx->alg_decrypt_wrapper,

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

        break;



    default:

        error_setg(errp, "Unsupported cipher algorithm %d",

                   cipher->alg);

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

                   QCryptoCipherMode_lookup[cipher->mode]);

        return -1;

    }

    return 0;

crypto/init.c

+1 −2
Original line number Diff line number Diff line
@@ -59,8 +59,7 @@ 


#if (defined(CONFIG_GCRYPT) &&                  \

     (!defined(CONFIG_GNUTLS) ||                \

      !defined(GNUTLS_VERSION_NUMBER) ||       \

      (GNUTLS_VERSION_NUMBER < 0x020c00)) &&    \

     (LIBGNUTLS_VERSION_NUMBER < 0x020c00)) &&    \

     (!defined(GCRYPT_VERSION_NUMBER) ||        \

      (GCRYPT_VERSION_NUMBER < 0x010600)))

#define QCRYPTO_INIT_GCRYPT_THREADS