Pedro Monreal Gonzalez
02d04cf4ae
- Fixed env-script-interpreter in cavs_driver.pl
- Security fix: [bsc#1138939, CVE-2019-12904]
* The C implementation of AES is vulnerable to a flush-and-reload
side-channel attack because physical addresses are available to
other processes. (The C implementation is used on platforms where
an assembly-language implementation is unavailable.)
* Added patches:
- libgcrypt-CVE-2019-12904-GCM-Prefetch.patch
- libgcrypt-CVE-2019-12904-GCM.patch
- libgcrypt-CVE-2019-12904-AES.patch
OBS-URL: https://build.opensuse.org/request/show/711377
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=127
81 lines
2.3 KiB
Diff
81 lines
2.3 KiB
Diff
From 1374254c2904ab5b18ba4a890856824a102d4705 Mon Sep 17 00:00:00 2001
|
|
From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
|
Date: Sat, 27 Apr 2019 19:33:28 +0300
|
|
Subject: [PATCH] Prefetch GCM look-up tables
|
|
|
|
* cipher/cipher-gcm.c (prefetch_table, do_prefetch_tables)
|
|
(prefetch_tables): New.
|
|
(ghash_internal): Call prefetch_tables.
|
|
--
|
|
|
|
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
|
---
|
|
cipher/cipher-gcm.c | 33 +++++++++++++++++++++++++++++++++
|
|
1 file changed, 33 insertions(+)
|
|
|
|
diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c
|
|
index c19f09f2..11f119aa 100644
|
|
--- a/cipher/cipher-gcm.c
|
|
+++ b/cipher/cipher-gcm.c
|
|
@@ -118,6 +118,34 @@ static const u16 gcmR[256] = {
|
|
0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe,
|
|
};
|
|
|
|
+static inline
|
|
+void prefetch_table(const void *tab, size_t len)
|
|
+{
|
|
+ const volatile byte *vtab = tab;
|
|
+ size_t i;
|
|
+
|
|
+ for (i = 0; i < len; i += 8 * 32)
|
|
+ {
|
|
+ (void)vtab[i + 0 * 32];
|
|
+ (void)vtab[i + 1 * 32];
|
|
+ (void)vtab[i + 2 * 32];
|
|
+ (void)vtab[i + 3 * 32];
|
|
+ (void)vtab[i + 4 * 32];
|
|
+ (void)vtab[i + 5 * 32];
|
|
+ (void)vtab[i + 6 * 32];
|
|
+ (void)vtab[i + 7 * 32];
|
|
+ }
|
|
+
|
|
+ (void)vtab[len - 1];
|
|
+}
|
|
+
|
|
+static inline void
|
|
+do_prefetch_tables (const void *gcmM, size_t gcmM_size)
|
|
+{
|
|
+ prefetch_table(gcmM, gcmM_size);
|
|
+ prefetch_table(gcmR, sizeof(gcmR));
|
|
+}
|
|
+
|
|
#ifdef GCM_TABLES_USE_U64
|
|
static void
|
|
bshift (u64 * b0, u64 * b1)
|
|
@@ -365,6 +393,8 @@ do_ghash (unsigned char *result, const unsigned char *buf, const u32 *gcmM)
|
|
#define fillM(c) \
|
|
do_fillM (c->u_mode.gcm.u_ghash_key.key, c->u_mode.gcm.gcm_table)
|
|
#define GHASH(c, result, buf) do_ghash (result, buf, c->u_mode.gcm.gcm_table)
|
|
+#define prefetch_tables(c) \
|
|
+ do_prefetch_tables(c->u_mode.gcm.gcm_table, sizeof(c->u_mode.gcm.gcm_table))
|
|
|
|
#else
|
|
|
|
@@ -430,6 +460,7 @@ do_ghash (unsigned char *hsub, unsigned char *result, const unsigned char *buf)
|
|
|
|
#define fillM(c) do { } while (0)
|
|
#define GHASH(c, result, buf) do_ghash (c->u_mode.gcm.u_ghash_key.key, result, buf)
|
|
+#define prefetch_tables(c) do {} while (0)
|
|
|
|
#endif /* !GCM_USE_TABLES */
|
|
|
|
@@ -441,6 +472,8 @@ ghash_internal (gcry_cipher_hd_t c, byte *result, const byte *buf,
|
|
const unsigned int blocksize = GCRY_GCM_BLOCK_LEN;
|
|
unsigned int burn = 0;
|
|
|
|
+ prefetch_tables (c);
|
|
+
|
|
while (nblocks)
|
|
{
|
|
burn = GHASH (c, result, buf);
|