|
 |
ae23c9 |
From e485d0702e2acf9b83aaf42f4cc62d804c1c282a Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
ae23c9 |
Date: Wed, 24 Apr 2019 09:56:38 +0100
|
|
|
ae23c9 |
Subject: [PATCH 4/9] crypto: introduce a xts_uint128 data type
|
|
|
ae23c9 |
MIME-Version: 1.0
|
|
|
ae23c9 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ae23c9 |
Content-Transfer-Encoding: 8bit
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
ae23c9 |
Message-id: <20190424095643.796-5-berrange@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 85882
|
|
|
ae23c9 |
O-Subject: [RHEL-8.1.0 qemu-kvm PATCH 4/9] crypto: introduce a xts_uint128 data type
|
|
|
ae23c9 |
Bugzilla: 1680231
|
|
|
ae23c9 |
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
The new type is designed to allow use of 64-bit arithmetic instead
|
|
|
ae23c9 |
of operating 1-byte at a time. The following patches will use this to
|
|
|
ae23c9 |
improve performance.
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Reviewed-by: Alberto Garcia <berto@igalia.com>
|
|
|
ae23c9 |
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
|
ae23c9 |
(cherry picked from commit cc36930e4077eb3dbee6cd30d2d826ec62b3490a)
|
|
|
ae23c9 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
crypto/xts.c | 46 ++++++++++++++++++++++++++--------------------
|
|
|
ae23c9 |
1 file changed, 26 insertions(+), 20 deletions(-)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/crypto/xts.c b/crypto/xts.c
|
|
|
ae23c9 |
index 3c1a92f..bee23f8 100644
|
|
|
ae23c9 |
--- a/crypto/xts.c
|
|
|
ae23c9 |
+++ b/crypto/xts.c
|
|
|
ae23c9 |
@@ -26,6 +26,12 @@
|
|
|
ae23c9 |
#include "qemu/osdep.h"
|
|
|
ae23c9 |
#include "crypto/xts.h"
|
|
|
ae23c9 |
|
|
|
ae23c9 |
+typedef union {
|
|
|
ae23c9 |
+ uint8_t b[XTS_BLOCK_SIZE];
|
|
|
ae23c9 |
+ uint64_t u[2];
|
|
|
ae23c9 |
+} xts_uint128;
|
|
|
ae23c9 |
+
|
|
|
ae23c9 |
+
|
|
|
ae23c9 |
static void xts_mult_x(uint8_t *I)
|
|
|
ae23c9 |
{
|
|
|
ae23c9 |
int x;
|
|
|
ae23c9 |
@@ -85,7 +91,7 @@ void xts_decrypt(const void *datactx,
|
|
|
ae23c9 |
uint8_t *dst,
|
|
|
ae23c9 |
const uint8_t *src)
|
|
|
ae23c9 |
{
|
|
|
ae23c9 |
- uint8_t PP[XTS_BLOCK_SIZE], CC[XTS_BLOCK_SIZE], T[XTS_BLOCK_SIZE];
|
|
|
ae23c9 |
+ xts_uint128 PP, CC, T;
|
|
|
ae23c9 |
unsigned long i, m, mo, lim;
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* get number of blocks */
|
|
|
ae23c9 |
@@ -102,10 +108,10 @@ void xts_decrypt(const void *datactx,
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* encrypt the iv */
|
|
|
ae23c9 |
- encfunc(tweakctx, XTS_BLOCK_SIZE, T, iv);
|
|
|
ae23c9 |
+ encfunc(tweakctx, XTS_BLOCK_SIZE, T.b, iv);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
for (i = 0; i < lim; i++) {
|
|
|
ae23c9 |
- xts_tweak_encdec(datactx, decfunc, src, dst, T);
|
|
|
ae23c9 |
+ xts_tweak_encdec(datactx, decfunc, src, dst, T.b);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
src += XTS_BLOCK_SIZE;
|
|
|
ae23c9 |
dst += XTS_BLOCK_SIZE;
|
|
|
ae23c9 |
@@ -113,27 +119,27 @@ void xts_decrypt(const void *datactx,
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* if length is not a multiple of XTS_BLOCK_SIZE then */
|
|
|
ae23c9 |
if (mo > 0) {
|
|
|
ae23c9 |
- memcpy(CC, T, XTS_BLOCK_SIZE);
|
|
|
ae23c9 |
- xts_mult_x(CC);
|
|
|
ae23c9 |
+ memcpy(&CC, &T, XTS_BLOCK_SIZE);
|
|
|
ae23c9 |
+ xts_mult_x(CC.b);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* PP = tweak decrypt block m-1 */
|
|
|
ae23c9 |
- xts_tweak_encdec(datactx, decfunc, src, PP, CC);
|
|
|
ae23c9 |
+ xts_tweak_encdec(datactx, decfunc, src, PP.b, CC.b);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* Pm = first length % XTS_BLOCK_SIZE bytes of PP */
|
|
|
ae23c9 |
for (i = 0; i < mo; i++) {
|
|
|
ae23c9 |
- CC[i] = src[XTS_BLOCK_SIZE + i];
|
|
|
ae23c9 |
- dst[XTS_BLOCK_SIZE + i] = PP[i];
|
|
|
ae23c9 |
+ CC.b[i] = src[XTS_BLOCK_SIZE + i];
|
|
|
ae23c9 |
+ dst[XTS_BLOCK_SIZE + i] = PP.b[i];
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
for (; i < XTS_BLOCK_SIZE; i++) {
|
|
|
ae23c9 |
- CC[i] = PP[i];
|
|
|
ae23c9 |
+ CC.b[i] = PP.b[i];
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* Pm-1 = Tweak uncrypt CC */
|
|
|
ae23c9 |
- xts_tweak_encdec(datactx, decfunc, CC, dst, T);
|
|
|
ae23c9 |
+ xts_tweak_encdec(datactx, decfunc, CC.b, dst, T.b);
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* Decrypt the iv back */
|
|
|
ae23c9 |
- decfunc(tweakctx, XTS_BLOCK_SIZE, iv, T);
|
|
|
ae23c9 |
+ decfunc(tweakctx, XTS_BLOCK_SIZE, iv, T.b);
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
|
|
|
ae23c9 |
@@ -146,7 +152,7 @@ void xts_encrypt(const void *datactx,
|
|
|
ae23c9 |
uint8_t *dst,
|
|
|
ae23c9 |
const uint8_t *src)
|
|
|
ae23c9 |
{
|
|
|
ae23c9 |
- uint8_t PP[XTS_BLOCK_SIZE], CC[XTS_BLOCK_SIZE], T[XTS_BLOCK_SIZE];
|
|
|
ae23c9 |
+ xts_uint128 PP, CC, T;
|
|
|
ae23c9 |
unsigned long i, m, mo, lim;
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* get number of blocks */
|
|
|
ae23c9 |
@@ -163,10 +169,10 @@ void xts_encrypt(const void *datactx,
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* encrypt the iv */
|
|
|
ae23c9 |
- encfunc(tweakctx, XTS_BLOCK_SIZE, T, iv);
|
|
|
ae23c9 |
+ encfunc(tweakctx, XTS_BLOCK_SIZE, T.b, iv);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
for (i = 0; i < lim; i++) {
|
|
|
ae23c9 |
- xts_tweak_encdec(datactx, encfunc, src, dst, T);
|
|
|
ae23c9 |
+ xts_tweak_encdec(datactx, encfunc, src, dst, T.b);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
dst += XTS_BLOCK_SIZE;
|
|
|
ae23c9 |
src += XTS_BLOCK_SIZE;
|
|
|
ae23c9 |
@@ -175,22 +181,22 @@ void xts_encrypt(const void *datactx,
|
|
|
ae23c9 |
/* if length is not a multiple of XTS_BLOCK_SIZE then */
|
|
|
ae23c9 |
if (mo > 0) {
|
|
|
ae23c9 |
/* CC = tweak encrypt block m-1 */
|
|
|
ae23c9 |
- xts_tweak_encdec(datactx, encfunc, src, CC, T);
|
|
|
ae23c9 |
+ xts_tweak_encdec(datactx, encfunc, src, CC.b, T.b);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* Cm = first length % XTS_BLOCK_SIZE bytes of CC */
|
|
|
ae23c9 |
for (i = 0; i < mo; i++) {
|
|
|
ae23c9 |
- PP[i] = src[XTS_BLOCK_SIZE + i];
|
|
|
ae23c9 |
- dst[XTS_BLOCK_SIZE + i] = CC[i];
|
|
|
ae23c9 |
+ PP.b[i] = src[XTS_BLOCK_SIZE + i];
|
|
|
ae23c9 |
+ dst[XTS_BLOCK_SIZE + i] = CC.b[i];
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
for (; i < XTS_BLOCK_SIZE; i++) {
|
|
|
ae23c9 |
- PP[i] = CC[i];
|
|
|
ae23c9 |
+ PP.b[i] = CC.b[i];
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* Cm-1 = Tweak encrypt PP */
|
|
|
ae23c9 |
- xts_tweak_encdec(datactx, encfunc, PP, dst, T);
|
|
|
ae23c9 |
+ xts_tweak_encdec(datactx, encfunc, PP.b, dst, T.b);
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/* Decrypt the iv back */
|
|
|
ae23c9 |
- decfunc(tweakctx, XTS_BLOCK_SIZE, iv, T);
|
|
|
ae23c9 |
+ decfunc(tweakctx, XTS_BLOCK_SIZE, iv, T.b);
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|