diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2017-09-27 13:53:36 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2017-10-06 16:30:47 +0200 |
| commit | 850f49de9b57511dcaf2cd7e45059f8f38fadf3b (patch) | |
| tree | 497e5c335910bdaa9a01d3fcc74eecdd344d986f /crypto/block-luks.c | |
| parent | 161253e2d0a83a1b33bca019c6e926013e1a03db (diff) | |
| download | qemu-850f49de9b57511dcaf2cd7e45059f8f38fadf3b.zip qemu-850f49de9b57511dcaf2cd7e45059f8f38fadf3b.tar.gz qemu-850f49de9b57511dcaf2cd7e45059f8f38fadf3b.tar.bz2 | |
crypto: expose encryption sector size in APIs
While current encryption schemes all have a fixed sector size of
512 bytes, this is not guaranteed to be the case in future. Expose
the sector size in the APIs so the block layer can remove assumptions
about fixed 512 byte sectors.
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 20170927125340.12360-3-berrange@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'crypto/block-luks.c')
| -rw-r--r-- | crypto/block-luks.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 36bc856..a9062bb 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -846,8 +846,9 @@ qcrypto_block_luks_open(QCryptoBlock *block, } } + block->sector_size = QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; block->payload_offset = luks->header.payload_offset * - QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; + block->sector_size; luks->cipher_alg = cipheralg; luks->cipher_mode = ciphermode; @@ -1240,8 +1241,9 @@ qcrypto_block_luks_create(QCryptoBlock *block, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE)) * QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS); + block->sector_size = QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; block->payload_offset = luks->header.payload_offset * - QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; + block->sector_size; /* Reserve header space to match payload offset */ initfunc(block, block->payload_offset, opaque, &local_err); |