Update version to 1.9.4
This commit is contained in:
zou_lin77
parent
b47289b457
commit
0938a362ac
@ -1,82 +0,0 @@
|
||||
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 193/222] 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);
|
||||
--
|
||||
2.12.3
|
||||
@ -1,168 +0,0 @@
|
||||
From a4c561aab1014c3630bc88faf6f5246fee16b020 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
||||
Date: Fri, 31 May 2019 17:27:25 +0300
|
||||
Subject: [PATCH] GCM: move look-up table to .data section and unshare between
|
||||
processes
|
||||
|
||||
* cipher/cipher-gcm.c (ATTR_ALIGNED_64): New.
|
||||
(gcmR): Move to 'gcm_table' structure.
|
||||
(gcm_table): New structure for look-up table with counters before and
|
||||
after.
|
||||
(gcmR): New macro.
|
||||
(prefetch_table): Handle input with length not multiple of 256.
|
||||
(do_prefetch_tables): Modify pre- and post-table counters to unshare
|
||||
look-up table pages between processes.
|
||||
--
|
||||
|
||||
GnuPG-bug-id: 4541
|
||||
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
||||
---
|
||||
cipher/cipher-gcm.c | 106 +++++++++++++++++++++++++++++---------------
|
||||
1 file changed, 70 insertions(+), 36 deletions(-)
|
||||
|
||||
diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c
|
||||
index 11f119aa..194e2ec9 100644
|
||||
--- a/cipher/cipher-gcm.c
|
||||
+++ b/cipher/cipher-gcm.c
|
||||
@@ -30,6 +30,14 @@
|
||||
#include "./cipher-internal.h"
|
||||
|
||||
|
||||
+/* Helper macro to force alignment to 16 or 64 bytes. */
|
||||
+#ifdef HAVE_GCC_ATTRIBUTE_ALIGNED
|
||||
+# define ATTR_ALIGNED_64 __attribute__ ((aligned (64)))
|
||||
+#else
|
||||
+# define ATTR_ALIGNED_64
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
#ifdef GCM_USE_INTEL_PCLMUL
|
||||
extern void _gcry_ghash_setup_intel_pclmul (gcry_cipher_hd_t c);
|
||||
|
||||
@@ -83,40 +91,54 @@ ghash_armv7_neon (gcry_cipher_hd_t c, byte *result, const byte *buf,
|
||||
|
||||
|
||||
#ifdef GCM_USE_TABLES
|
||||
-static const u16 gcmR[256] = {
|
||||
- 0x0000, 0x01c2, 0x0384, 0x0246, 0x0708, 0x06ca, 0x048c, 0x054e,
|
||||
- 0x0e10, 0x0fd2, 0x0d94, 0x0c56, 0x0918, 0x08da, 0x0a9c, 0x0b5e,
|
||||
- 0x1c20, 0x1de2, 0x1fa4, 0x1e66, 0x1b28, 0x1aea, 0x18ac, 0x196e,
|
||||
- 0x1230, 0x13f2, 0x11b4, 0x1076, 0x1538, 0x14fa, 0x16bc, 0x177e,
|
||||
- 0x3840, 0x3982, 0x3bc4, 0x3a06, 0x3f48, 0x3e8a, 0x3ccc, 0x3d0e,
|
||||
- 0x3650, 0x3792, 0x35d4, 0x3416, 0x3158, 0x309a, 0x32dc, 0x331e,
|
||||
- 0x2460, 0x25a2, 0x27e4, 0x2626, 0x2368, 0x22aa, 0x20ec, 0x212e,
|
||||
- 0x2a70, 0x2bb2, 0x29f4, 0x2836, 0x2d78, 0x2cba, 0x2efc, 0x2f3e,
|
||||
- 0x7080, 0x7142, 0x7304, 0x72c6, 0x7788, 0x764a, 0x740c, 0x75ce,
|
||||
- 0x7e90, 0x7f52, 0x7d14, 0x7cd6, 0x7998, 0x785a, 0x7a1c, 0x7bde,
|
||||
- 0x6ca0, 0x6d62, 0x6f24, 0x6ee6, 0x6ba8, 0x6a6a, 0x682c, 0x69ee,
|
||||
- 0x62b0, 0x6372, 0x6134, 0x60f6, 0x65b8, 0x647a, 0x663c, 0x67fe,
|
||||
- 0x48c0, 0x4902, 0x4b44, 0x4a86, 0x4fc8, 0x4e0a, 0x4c4c, 0x4d8e,
|
||||
- 0x46d0, 0x4712, 0x4554, 0x4496, 0x41d8, 0x401a, 0x425c, 0x439e,
|
||||
- 0x54e0, 0x5522, 0x5764, 0x56a6, 0x53e8, 0x522a, 0x506c, 0x51ae,
|
||||
- 0x5af0, 0x5b32, 0x5974, 0x58b6, 0x5df8, 0x5c3a, 0x5e7c, 0x5fbe,
|
||||
- 0xe100, 0xe0c2, 0xe284, 0xe346, 0xe608, 0xe7ca, 0xe58c, 0xe44e,
|
||||
- 0xef10, 0xeed2, 0xec94, 0xed56, 0xe818, 0xe9da, 0xeb9c, 0xea5e,
|
||||
- 0xfd20, 0xfce2, 0xfea4, 0xff66, 0xfa28, 0xfbea, 0xf9ac, 0xf86e,
|
||||
- 0xf330, 0xf2f2, 0xf0b4, 0xf176, 0xf438, 0xf5fa, 0xf7bc, 0xf67e,
|
||||
- 0xd940, 0xd882, 0xdac4, 0xdb06, 0xde48, 0xdf8a, 0xddcc, 0xdc0e,
|
||||
- 0xd750, 0xd692, 0xd4d4, 0xd516, 0xd058, 0xd19a, 0xd3dc, 0xd21e,
|
||||
- 0xc560, 0xc4a2, 0xc6e4, 0xc726, 0xc268, 0xc3aa, 0xc1ec, 0xc02e,
|
||||
- 0xcb70, 0xcab2, 0xc8f4, 0xc936, 0xcc78, 0xcdba, 0xcffc, 0xce3e,
|
||||
- 0x9180, 0x9042, 0x9204, 0x93c6, 0x9688, 0x974a, 0x950c, 0x94ce,
|
||||
- 0x9f90, 0x9e52, 0x9c14, 0x9dd6, 0x9898, 0x995a, 0x9b1c, 0x9ade,
|
||||
- 0x8da0, 0x8c62, 0x8e24, 0x8fe6, 0x8aa8, 0x8b6a, 0x892c, 0x88ee,
|
||||
- 0x83b0, 0x8272, 0x8034, 0x81f6, 0x84b8, 0x857a, 0x873c, 0x86fe,
|
||||
- 0xa9c0, 0xa802, 0xaa44, 0xab86, 0xaec8, 0xaf0a, 0xad4c, 0xac8e,
|
||||
- 0xa7d0, 0xa612, 0xa454, 0xa596, 0xa0d8, 0xa11a, 0xa35c, 0xa29e,
|
||||
- 0xb5e0, 0xb422, 0xb664, 0xb7a6, 0xb2e8, 0xb32a, 0xb16c, 0xb0ae,
|
||||
- 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe,
|
||||
-};
|
||||
+static struct
|
||||
+{
|
||||
+ volatile u32 counter_head;
|
||||
+ u32 cacheline_align[64 / 4 - 1];
|
||||
+ u16 R[256];
|
||||
+ volatile u32 counter_tail;
|
||||
+} gcm_table ATTR_ALIGNED_64 =
|
||||
+ {
|
||||
+ 0,
|
||||
+ { 0, },
|
||||
+ {
|
||||
+ 0x0000, 0x01c2, 0x0384, 0x0246, 0x0708, 0x06ca, 0x048c, 0x054e,
|
||||
+ 0x0e10, 0x0fd2, 0x0d94, 0x0c56, 0x0918, 0x08da, 0x0a9c, 0x0b5e,
|
||||
+ 0x1c20, 0x1de2, 0x1fa4, 0x1e66, 0x1b28, 0x1aea, 0x18ac, 0x196e,
|
||||
+ 0x1230, 0x13f2, 0x11b4, 0x1076, 0x1538, 0x14fa, 0x16bc, 0x177e,
|
||||
+ 0x3840, 0x3982, 0x3bc4, 0x3a06, 0x3f48, 0x3e8a, 0x3ccc, 0x3d0e,
|
||||
+ 0x3650, 0x3792, 0x35d4, 0x3416, 0x3158, 0x309a, 0x32dc, 0x331e,
|
||||
+ 0x2460, 0x25a2, 0x27e4, 0x2626, 0x2368, 0x22aa, 0x20ec, 0x212e,
|
||||
+ 0x2a70, 0x2bb2, 0x29f4, 0x2836, 0x2d78, 0x2cba, 0x2efc, 0x2f3e,
|
||||
+ 0x7080, 0x7142, 0x7304, 0x72c6, 0x7788, 0x764a, 0x740c, 0x75ce,
|
||||
+ 0x7e90, 0x7f52, 0x7d14, 0x7cd6, 0x7998, 0x785a, 0x7a1c, 0x7bde,
|
||||
+ 0x6ca0, 0x6d62, 0x6f24, 0x6ee6, 0x6ba8, 0x6a6a, 0x682c, 0x69ee,
|
||||
+ 0x62b0, 0x6372, 0x6134, 0x60f6, 0x65b8, 0x647a, 0x663c, 0x67fe,
|
||||
+ 0x48c0, 0x4902, 0x4b44, 0x4a86, 0x4fc8, 0x4e0a, 0x4c4c, 0x4d8e,
|
||||
+ 0x46d0, 0x4712, 0x4554, 0x4496, 0x41d8, 0x401a, 0x425c, 0x439e,
|
||||
+ 0x54e0, 0x5522, 0x5764, 0x56a6, 0x53e8, 0x522a, 0x506c, 0x51ae,
|
||||
+ 0x5af0, 0x5b32, 0x5974, 0x58b6, 0x5df8, 0x5c3a, 0x5e7c, 0x5fbe,
|
||||
+ 0xe100, 0xe0c2, 0xe284, 0xe346, 0xe608, 0xe7ca, 0xe58c, 0xe44e,
|
||||
+ 0xef10, 0xeed2, 0xec94, 0xed56, 0xe818, 0xe9da, 0xeb9c, 0xea5e,
|
||||
+ 0xfd20, 0xfce2, 0xfea4, 0xff66, 0xfa28, 0xfbea, 0xf9ac, 0xf86e,
|
||||
+ 0xf330, 0xf2f2, 0xf0b4, 0xf176, 0xf438, 0xf5fa, 0xf7bc, 0xf67e,
|
||||
+ 0xd940, 0xd882, 0xdac4, 0xdb06, 0xde48, 0xdf8a, 0xddcc, 0xdc0e,
|
||||
+ 0xd750, 0xd692, 0xd4d4, 0xd516, 0xd058, 0xd19a, 0xd3dc, 0xd21e,
|
||||
+ 0xc560, 0xc4a2, 0xc6e4, 0xc726, 0xc268, 0xc3aa, 0xc1ec, 0xc02e,
|
||||
+ 0xcb70, 0xcab2, 0xc8f4, 0xc936, 0xcc78, 0xcdba, 0xcffc, 0xce3e,
|
||||
+ 0x9180, 0x9042, 0x9204, 0x93c6, 0x9688, 0x974a, 0x950c, 0x94ce,
|
||||
+ 0x9f90, 0x9e52, 0x9c14, 0x9dd6, 0x9898, 0x995a, 0x9b1c, 0x9ade,
|
||||
+ 0x8da0, 0x8c62, 0x8e24, 0x8fe6, 0x8aa8, 0x8b6a, 0x892c, 0x88ee,
|
||||
+ 0x83b0, 0x8272, 0x8034, 0x81f6, 0x84b8, 0x857a, 0x873c, 0x86fe,
|
||||
+ 0xa9c0, 0xa802, 0xaa44, 0xab86, 0xaec8, 0xaf0a, 0xad4c, 0xac8e,
|
||||
+ 0xa7d0, 0xa612, 0xa454, 0xa596, 0xa0d8, 0xa11a, 0xa35c, 0xa29e,
|
||||
+ 0xb5e0, 0xb422, 0xb664, 0xb7a6, 0xb2e8, 0xb32a, 0xb16c, 0xb0ae,
|
||||
+ 0xbbf0, 0xba32, 0xb874, 0xb9b6, 0xbcf8, 0xbd3a, 0xbf7c, 0xbebe,
|
||||
+ },
|
||||
+ 0
|
||||
+ };
|
||||
+
|
||||
+#define gcmR gcm_table.R
|
||||
|
||||
static inline
|
||||
void prefetch_table(const void *tab, size_t len)
|
||||
@@ -124,7 +146,7 @@ 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)
|
||||
+ for (i = 0; len - i >= 8 * 32; i += 8 * 32)
|
||||
{
|
||||
(void)vtab[i + 0 * 32];
|
||||
(void)vtab[i + 1 * 32];
|
||||
@@ -135,6 +157,10 @@ void prefetch_table(const void *tab, size_t len)
|
||||
(void)vtab[i + 6 * 32];
|
||||
(void)vtab[i + 7 * 32];
|
||||
}
|
||||
+ for (; i < len; i += 32)
|
||||
+ {
|
||||
+ (void)vtab[i];
|
||||
+ }
|
||||
|
||||
(void)vtab[len - 1];
|
||||
}
|
||||
@@ -142,8 +168,16 @@ void prefetch_table(const void *tab, size_t len)
|
||||
static inline void
|
||||
do_prefetch_tables (const void *gcmM, size_t gcmM_size)
|
||||
{
|
||||
+ /* Modify counters to trigger copy-on-write and unsharing if physical pages
|
||||
+ * of look-up table are shared between processes. Modifying counters also
|
||||
+ * causes checksums for pages to change and hint same-page merging algorithm
|
||||
+ * that these pages are frequently changing. */
|
||||
+ gcm_table.counter_head++;
|
||||
+ gcm_table.counter_tail++;
|
||||
+
|
||||
+ /* Prefetch look-up tables to cache. */
|
||||
prefetch_table(gcmM, gcmM_size);
|
||||
- prefetch_table(gcmR, sizeof(gcmR));
|
||||
+ prefetch_table(&gcm_table, sizeof(gcm_table));
|
||||
}
|
||||
|
||||
#ifdef GCM_TABLES_USE_U64
|
||||
@ -1,323 +0,0 @@
|
||||
From daedbbb5541cd8ecda1459d3b843ea4d92788762 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
||||
Date: Fri, 31 May 2019 17:18:09 +0300
|
||||
Subject: [PATCH] AES: move look-up tables to .data section and unshare between
|
||||
processes
|
||||
|
||||
* cipher/rijndael-internal.h (ATTR_ALIGNED_64): New.
|
||||
* cipher/rijndael-tables.h (encT): Move to 'enc_tables' structure.
|
||||
(enc_tables): New structure for encryption table with counters before
|
||||
and after.
|
||||
(encT): New macro.
|
||||
(dec_tables): Add counters before and after encryption table; Move
|
||||
from .rodata to .data section.
|
||||
(do_encrypt): Change 'encT' to 'enc_tables.T'.
|
||||
(do_decrypt): Change '&dec_tables' to 'dec_tables.T'.
|
||||
* cipher/cipher-gcm.c (prefetch_table): Make inline; Handle input
|
||||
with length not multiple of 256.
|
||||
(prefetch_enc, prefetch_dec): Modify pre- and post-table counters
|
||||
to unshare look-up table pages between processes.
|
||||
--
|
||||
|
||||
GnuPG-bug-id: 4541
|
||||
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
|
||||
---
|
||||
cipher/rijndael-internal.h | 4 +-
|
||||
cipher/rijndael-tables.h | 155 +++++++++++++++++++++----------------
|
||||
cipher/rijndael.c | 35 +++++++--
|
||||
3 files changed, 118 insertions(+), 76 deletions(-)
|
||||
|
||||
diff --git a/cipher/rijndael-internal.h b/cipher/rijndael-internal.h
|
||||
index 160fb8c..a62d4b7 100644
|
||||
--- a/cipher/rijndael-internal.h
|
||||
+++ b/cipher/rijndael-internal.h
|
||||
@@ -29,11 +29,13 @@
|
||||
#define BLOCKSIZE (128/8)
|
||||
|
||||
|
||||
-/* Helper macro to force alignment to 16 bytes. */
|
||||
+/* Helper macro to force alignment to 16 or 64 bytes. */
|
||||
#ifdef HAVE_GCC_ATTRIBUTE_ALIGNED
|
||||
# define ATTR_ALIGNED_16 __attribute__ ((aligned (16)))
|
||||
+# define ATTR_ALIGNED_64 __attribute__ ((aligned (64)))
|
||||
#else
|
||||
# define ATTR_ALIGNED_16
|
||||
+# define ATTR_ALIGNED_64
|
||||
#endif
|
||||
|
||||
|
||||
diff --git a/cipher/rijndael-tables.h b/cipher/rijndael-tables.h
|
||||
index 8359470..b54d959 100644
|
||||
--- a/cipher/rijndael-tables.h
|
||||
+++ b/cipher/rijndael-tables.h
|
||||
@@ -21,80 +21,98 @@
|
||||
/* To keep the actual implementation at a readable size we use this
|
||||
include file to define the tables. */
|
||||
|
||||
-static const u32 encT[256] =
|
||||
+static struct
|
||||
+{
|
||||
+ volatile u32 counter_head;
|
||||
+ u32 cacheline_align[64 / 4 - 1];
|
||||
+ u32 T[256];
|
||||
+ volatile u32 counter_tail;
|
||||
+} enc_tables ATTR_ALIGNED_64 =
|
||||
{
|
||||
- 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
|
||||
- 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
|
||||
- 0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
|
||||
- 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
|
||||
- 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
|
||||
- 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
|
||||
- 0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
|
||||
- 0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
|
||||
- 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
|
||||
- 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
|
||||
- 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
|
||||
- 0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
|
||||
- 0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
|
||||
- 0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
|
||||
- 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
|
||||
- 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
|
||||
- 0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
|
||||
- 0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
|
||||
- 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
|
||||
- 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
|
||||
- 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
|
||||
- 0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
|
||||
- 0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
|
||||
- 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
|
||||
- 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
|
||||
- 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
|
||||
- 0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
|
||||
- 0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
|
||||
- 0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
|
||||
- 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
|
||||
- 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
|
||||
- 0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
|
||||
- 0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
|
||||
- 0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
|
||||
- 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
|
||||
- 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
|
||||
- 0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
|
||||
- 0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
|
||||
- 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
|
||||
- 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
|
||||
- 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
|
||||
- 0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
|
||||
- 0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
|
||||
- 0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
|
||||
- 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
|
||||
- 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
|
||||
- 0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
|
||||
- 0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
|
||||
- 0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
|
||||
- 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
|
||||
- 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
|
||||
- 0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
|
||||
- 0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
|
||||
- 0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
|
||||
- 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
|
||||
- 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
|
||||
- 0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
|
||||
- 0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
|
||||
- 0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
|
||||
- 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
|
||||
- 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
|
||||
- 0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
|
||||
- 0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
|
||||
- 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c
|
||||
+ 0,
|
||||
+ { 0, },
|
||||
+ {
|
||||
+ 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6,
|
||||
+ 0x0df2f2ff, 0xbd6b6bd6, 0xb16f6fde, 0x54c5c591,
|
||||
+ 0x50303060, 0x03010102, 0xa96767ce, 0x7d2b2b56,
|
||||
+ 0x19fefee7, 0x62d7d7b5, 0xe6abab4d, 0x9a7676ec,
|
||||
+ 0x45caca8f, 0x9d82821f, 0x40c9c989, 0x877d7dfa,
|
||||
+ 0x15fafaef, 0xeb5959b2, 0xc947478e, 0x0bf0f0fb,
|
||||
+ 0xecadad41, 0x67d4d4b3, 0xfda2a25f, 0xeaafaf45,
|
||||
+ 0xbf9c9c23, 0xf7a4a453, 0x967272e4, 0x5bc0c09b,
|
||||
+ 0xc2b7b775, 0x1cfdfde1, 0xae93933d, 0x6a26264c,
|
||||
+ 0x5a36366c, 0x413f3f7e, 0x02f7f7f5, 0x4fcccc83,
|
||||
+ 0x5c343468, 0xf4a5a551, 0x34e5e5d1, 0x08f1f1f9,
|
||||
+ 0x937171e2, 0x73d8d8ab, 0x53313162, 0x3f15152a,
|
||||
+ 0x0c040408, 0x52c7c795, 0x65232346, 0x5ec3c39d,
|
||||
+ 0x28181830, 0xa1969637, 0x0f05050a, 0xb59a9a2f,
|
||||
+ 0x0907070e, 0x36121224, 0x9b80801b, 0x3de2e2df,
|
||||
+ 0x26ebebcd, 0x6927274e, 0xcdb2b27f, 0x9f7575ea,
|
||||
+ 0x1b090912, 0x9e83831d, 0x742c2c58, 0x2e1a1a34,
|
||||
+ 0x2d1b1b36, 0xb26e6edc, 0xee5a5ab4, 0xfba0a05b,
|
||||
+ 0xf65252a4, 0x4d3b3b76, 0x61d6d6b7, 0xceb3b37d,
|
||||
+ 0x7b292952, 0x3ee3e3dd, 0x712f2f5e, 0x97848413,
|
||||
+ 0xf55353a6, 0x68d1d1b9, 0x00000000, 0x2cededc1,
|
||||
+ 0x60202040, 0x1ffcfce3, 0xc8b1b179, 0xed5b5bb6,
|
||||
+ 0xbe6a6ad4, 0x46cbcb8d, 0xd9bebe67, 0x4b393972,
|
||||
+ 0xde4a4a94, 0xd44c4c98, 0xe85858b0, 0x4acfcf85,
|
||||
+ 0x6bd0d0bb, 0x2aefefc5, 0xe5aaaa4f, 0x16fbfbed,
|
||||
+ 0xc5434386, 0xd74d4d9a, 0x55333366, 0x94858511,
|
||||
+ 0xcf45458a, 0x10f9f9e9, 0x06020204, 0x817f7ffe,
|
||||
+ 0xf05050a0, 0x443c3c78, 0xba9f9f25, 0xe3a8a84b,
|
||||
+ 0xf35151a2, 0xfea3a35d, 0xc0404080, 0x8a8f8f05,
|
||||
+ 0xad92923f, 0xbc9d9d21, 0x48383870, 0x04f5f5f1,
|
||||
+ 0xdfbcbc63, 0xc1b6b677, 0x75dadaaf, 0x63212142,
|
||||
+ 0x30101020, 0x1affffe5, 0x0ef3f3fd, 0x6dd2d2bf,
|
||||
+ 0x4ccdcd81, 0x140c0c18, 0x35131326, 0x2fececc3,
|
||||
+ 0xe15f5fbe, 0xa2979735, 0xcc444488, 0x3917172e,
|
||||
+ 0x57c4c493, 0xf2a7a755, 0x827e7efc, 0x473d3d7a,
|
||||
+ 0xac6464c8, 0xe75d5dba, 0x2b191932, 0x957373e6,
|
||||
+ 0xa06060c0, 0x98818119, 0xd14f4f9e, 0x7fdcdca3,
|
||||
+ 0x66222244, 0x7e2a2a54, 0xab90903b, 0x8388880b,
|
||||
+ 0xca46468c, 0x29eeeec7, 0xd3b8b86b, 0x3c141428,
|
||||
+ 0x79dedea7, 0xe25e5ebc, 0x1d0b0b16, 0x76dbdbad,
|
||||
+ 0x3be0e0db, 0x56323264, 0x4e3a3a74, 0x1e0a0a14,
|
||||
+ 0xdb494992, 0x0a06060c, 0x6c242448, 0xe45c5cb8,
|
||||
+ 0x5dc2c29f, 0x6ed3d3bd, 0xefacac43, 0xa66262c4,
|
||||
+ 0xa8919139, 0xa4959531, 0x37e4e4d3, 0x8b7979f2,
|
||||
+ 0x32e7e7d5, 0x43c8c88b, 0x5937376e, 0xb76d6dda,
|
||||
+ 0x8c8d8d01, 0x64d5d5b1, 0xd24e4e9c, 0xe0a9a949,
|
||||
+ 0xb46c6cd8, 0xfa5656ac, 0x07f4f4f3, 0x25eaeacf,
|
||||
+ 0xaf6565ca, 0x8e7a7af4, 0xe9aeae47, 0x18080810,
|
||||
+ 0xd5baba6f, 0x887878f0, 0x6f25254a, 0x722e2e5c,
|
||||
+ 0x241c1c38, 0xf1a6a657, 0xc7b4b473, 0x51c6c697,
|
||||
+ 0x23e8e8cb, 0x7cdddda1, 0x9c7474e8, 0x211f1f3e,
|
||||
+ 0xdd4b4b96, 0xdcbdbd61, 0x868b8b0d, 0x858a8a0f,
|
||||
+ 0x907070e0, 0x423e3e7c, 0xc4b5b571, 0xaa6666cc,
|
||||
+ 0xd8484890, 0x05030306, 0x01f6f6f7, 0x120e0e1c,
|
||||
+ 0xa36161c2, 0x5f35356a, 0xf95757ae, 0xd0b9b969,
|
||||
+ 0x91868617, 0x58c1c199, 0x271d1d3a, 0xb99e9e27,
|
||||
+ 0x38e1e1d9, 0x13f8f8eb, 0xb398982b, 0x33111122,
|
||||
+ 0xbb6969d2, 0x70d9d9a9, 0x898e8e07, 0xa7949433,
|
||||
+ 0xb69b9b2d, 0x221e1e3c, 0x92878715, 0x20e9e9c9,
|
||||
+ 0x49cece87, 0xff5555aa, 0x78282850, 0x7adfdfa5,
|
||||
+ 0x8f8c8c03, 0xf8a1a159, 0x80898909, 0x170d0d1a,
|
||||
+ 0xdabfbf65, 0x31e6e6d7, 0xc6424284, 0xb86868d0,
|
||||
+ 0xc3414182, 0xb0999929, 0x772d2d5a, 0x110f0f1e,
|
||||
+ 0xcbb0b07b, 0xfc5454a8, 0xd6bbbb6d, 0x3a16162c
|
||||
+ },
|
||||
+ 0
|
||||
};
|
||||
|
||||
-static const struct
|
||||
+#define encT enc_tables.T
|
||||
+
|
||||
+static struct
|
||||
{
|
||||
+ volatile u32 counter_head;
|
||||
+ u32 cacheline_align[64 / 4 - 1];
|
||||
u32 T[256];
|
||||
byte inv_sbox[256];
|
||||
-} dec_tables =
|
||||
+ volatile u32 counter_tail;
|
||||
+} dec_tables ATTR_ALIGNED_64 =
|
||||
{
|
||||
+ 0,
|
||||
+ { 0, },
|
||||
{
|
||||
0x50a7f451, 0x5365417e, 0xc3a4171a, 0x965e273a,
|
||||
0xcb6bab3b, 0xf1459d1f, 0xab58faac, 0x9303e34b,
|
||||
@@ -194,7 +212,8 @@ static const struct
|
||||
0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61,
|
||||
0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26,
|
||||
0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
|
||||
- }
|
||||
+ },
|
||||
+ 0
|
||||
};
|
||||
|
||||
#define decT dec_tables.T
|
||||
diff --git a/cipher/rijndael.c b/cipher/rijndael.c
|
||||
index 8637195..d0edab2 100644
|
||||
--- a/cipher/rijndael.c
|
||||
+++ b/cipher/rijndael.c
|
||||
@@ -227,11 +227,11 @@ static const char *selftest(void);
|
||||
|
||||
|
||||
/* Prefetching for encryption/decryption tables. */
|
||||
-static void prefetch_table(const volatile byte *tab, size_t len)
|
||||
+static inline void prefetch_table(const volatile byte *tab, size_t len)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
- for (i = 0; i < len; i += 8 * 32)
|
||||
+ for (i = 0; len - i >= 8 * 32; i += 8 * 32)
|
||||
{
|
||||
(void)tab[i + 0 * 32];
|
||||
(void)tab[i + 1 * 32];
|
||||
@@ -242,17 +242,37 @@ static void prefetch_table(const volatile byte *tab, size_t len)
|
||||
(void)tab[i + 6 * 32];
|
||||
(void)tab[i + 7 * 32];
|
||||
}
|
||||
+ for (; i < len; i += 32)
|
||||
+ {
|
||||
+ (void)tab[i];
|
||||
+ }
|
||||
|
||||
(void)tab[len - 1];
|
||||
}
|
||||
|
||||
static void prefetch_enc(void)
|
||||
{
|
||||
- prefetch_table((const void *)encT, sizeof(encT));
|
||||
+ /* Modify counters to trigger copy-on-write and unsharing if physical pages
|
||||
+ * of look-up table are shared between processes. Modifying counters also
|
||||
+ * causes checksums for pages to change and hint same-page merging algorithm
|
||||
+ * that these pages are frequently changing. */
|
||||
+ enc_tables.counter_head++;
|
||||
+ enc_tables.counter_tail++;
|
||||
+
|
||||
+ /* Prefetch look-up tables to cache. */
|
||||
+ prefetch_table((const void *)&enc_tables, sizeof(enc_tables));
|
||||
}
|
||||
|
||||
static void prefetch_dec(void)
|
||||
{
|
||||
+ /* Modify counters to trigger copy-on-write and unsharing if physical pages
|
||||
+ * of look-up table are shared between processes. Modifying counters also
|
||||
+ * causes checksums for pages to change and hint same-page merging algorithm
|
||||
+ * that these pages are frequently changing. */
|
||||
+ dec_tables.counter_head++;
|
||||
+ dec_tables.counter_tail++;
|
||||
+
|
||||
+ /* Prefetch look-up tables to cache. */
|
||||
prefetch_table((const void *)&dec_tables, sizeof(dec_tables));
|
||||
}
|
||||
|
||||
@@ -737,7 +757,7 @@ do_encrypt (const RIJNDAEL_context *ctx,
|
||||
#ifdef USE_AMD64_ASM
|
||||
# ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
|
||||
return _gcry_aes_amd64_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds,
|
||||
- encT);
|
||||
+ enc_tables.T);
|
||||
# else
|
||||
/* Call SystemV ABI function without storing non-volatile XMM registers,
|
||||
* as target function does not use vector instruction sets. */
|
||||
@@ -757,7 +777,8 @@ do_encrypt (const RIJNDAEL_context *ctx,
|
||||
return ret;
|
||||
# endif /* HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */
|
||||
#elif defined(USE_ARM_ASM)
|
||||
- return _gcry_aes_arm_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds, encT);
|
||||
+ return _gcry_aes_arm_encrypt_block(ctx->keyschenc, bx, ax, ctx->rounds,
|
||||
+ enc_tables.T);
|
||||
#else
|
||||
return do_encrypt_fn (ctx, bx, ax);
|
||||
#endif /* !USE_ARM_ASM && !USE_AMD64_ASM*/
|
||||
@@ -1120,7 +1141,7 @@ do_decrypt (const RIJNDAEL_context *ctx, unsigned char *bx,
|
||||
#ifdef USE_AMD64_ASM
|
||||
# ifdef HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS
|
||||
return _gcry_aes_amd64_decrypt_block(ctx->keyschdec, bx, ax, ctx->rounds,
|
||||
- &dec_tables);
|
||||
+ dec_tables.T);
|
||||
# else
|
||||
/* Call SystemV ABI function without storing non-volatile XMM registers,
|
||||
* as target function does not use vector instruction sets. */
|
||||
@@ -1141,7 +1162,7 @@ do_decrypt (const RIJNDAEL_context *ctx, unsigned char *bx,
|
||||
# endif /* HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS */
|
||||
#elif defined(USE_ARM_ASM)
|
||||
return _gcry_aes_arm_decrypt_block(ctx->keyschdec, bx, ax, ctx->rounds,
|
||||
- &dec_tables);
|
||||
+ dec_tables.T);
|
||||
#else
|
||||
return do_decrypt_fn (ctx, bx, ax);
|
||||
#endif /*!USE_ARM_ASM && !USE_AMD64_ASM*/
|
||||
|
||||
@ -1,73 +0,0 @@
|
||||
From e8b7f10be275bcedb5fc05ed4837a89bfd605c61 Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Tue, 13 Apr 2021 10:00:00 +0900
|
||||
Subject: [PATCH] cipher: Hardening ElGamal by introducing exponent blinding
|
||||
too.
|
||||
|
||||
* cipher/elgamal.c (do_encrypt): Also do exponent blinding.
|
||||
|
||||
--
|
||||
|
||||
Base blinding had been introduced with USE_BLINDING. This patch add
|
||||
exponent blinding as well to mitigate side-channel attack on mpi_powm.
|
||||
|
||||
GnuPG-bug-id: 5328
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
---
|
||||
cipher/elgamal.c | 20 +++++++++++++++++---
|
||||
1 file changed, 17 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cipher/elgamal.c b/cipher/elgamal.c
|
||||
index 4eb52d6..9835122 100644
|
||||
--- a/cipher/elgamal.c
|
||||
+++ b/cipher/elgamal.c
|
||||
@@ -522,8 +522,9 @@ do_encrypt(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_public_key *pkey )
|
||||
static void
|
||||
decrypt (gcry_mpi_t output, gcry_mpi_t a, gcry_mpi_t b, ELG_secret_key *skey )
|
||||
{
|
||||
- gcry_mpi_t t1, t2, r;
|
||||
+ gcry_mpi_t t1, t2, r, r1, h;
|
||||
unsigned int nbits = mpi_get_nbits (skey->p);
|
||||
+ gcry_mpi_t x_blind;
|
||||
|
||||
mpi_normalize (a);
|
||||
mpi_normalize (b);
|
||||
@@ -534,20 +535,33 @@ decrypt (gcry_mpi_t output, gcry_mpi_t a, gcry_mpi_t b, ELG_secret_key *skey )
|
||||
|
||||
t2 = mpi_snew (nbits);
|
||||
r = mpi_new (nbits);
|
||||
+ r1 = mpi_new (nbits);
|
||||
+ h = mpi_new (nbits);
|
||||
+ x_blind = mpi_snew (nbits);
|
||||
|
||||
/* We need a random number of about the prime size. The random
|
||||
number merely needs to be unpredictable; thus we use level 0. */
|
||||
_gcry_mpi_randomize (r, nbits, GCRY_WEAK_RANDOM);
|
||||
|
||||
+ /* Also, exponent blinding: x_blind = x + (p-1)*r1 */
|
||||
+ _gcry_mpi_randomize (r1, nbits, GCRY_WEAK_RANDOM);
|
||||
+ mpi_set_highbit (r1, nbits - 1);
|
||||
+ mpi_sub_ui (h, skey->p, 1);
|
||||
+ mpi_mul (x_blind, h, r1);
|
||||
+ mpi_add (x_blind, skey->x, x_blind);
|
||||
+
|
||||
/* t1 = r^x mod p */
|
||||
- mpi_powm (t1, r, skey->x, skey->p);
|
||||
+ mpi_powm (t1, r, x_blind, skey->p);
|
||||
/* t2 = (a * r)^-x mod p */
|
||||
mpi_mulm (t2, a, r, skey->p);
|
||||
- mpi_powm (t2, t2, skey->x, skey->p);
|
||||
+ mpi_powm (t2, t2, x_blind, skey->p);
|
||||
mpi_invm (t2, t2, skey->p);
|
||||
/* t1 = (t1 * t2) mod p*/
|
||||
mpi_mulm (t1, t1, t2, skey->p);
|
||||
|
||||
+ mpi_free (x_blind);
|
||||
+ mpi_free (h);
|
||||
+ mpi_free (r1);
|
||||
mpi_free (r);
|
||||
mpi_free (t2);
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,105 +0,0 @@
|
||||
From 3462280f2e23e16adf3ed5176e0f2413d8861320 Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Fri, 21 May 2021 11:15:07 +0900
|
||||
Subject: [PATCH] cipher: Fix ElGamal encryption for other implementations.
|
||||
|
||||
* cipher/elgamal.c (gen_k): Remove support of smaller K.
|
||||
(do_encrypt): Never use smaller K.
|
||||
(sign): Folllow the change of gen_k.
|
||||
|
||||
--
|
||||
|
||||
Cherry-pick master commit of:
|
||||
632d80ef30e13de6926d503aa697f92b5dbfbc5e
|
||||
|
||||
This change basically reverts encryption changes in two commits:
|
||||
|
||||
74386120dad6b3da62db37f7044267c8ef34689b
|
||||
78531373a342aeb847950f404343a05e36022065
|
||||
|
||||
Use of smaller K for ephemeral key in ElGamal encryption is only good,
|
||||
when we can guarantee that recipient's key is generated by our
|
||||
implementation (or compatible).
|
||||
|
||||
For detail, please see:
|
||||
|
||||
Luca De Feo, Bertram Poettering, Alessandro Sorniotti,
|
||||
"On the (in)security of ElGamal in OpenPGP";
|
||||
in the proceedings of CCS'2021.
|
||||
|
||||
CVE-id: CVE-2021-33560(This patch actually modifies CVE-2021-40528,see:https://dev.gnupg.org/T5328#149606)
|
||||
GnuPG-bug-id: 5328
|
||||
Suggested-by: Luca De Feo, Bertram Poettering, Alessandro Sorniotti
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
---
|
||||
cipher/elgamal.c | 24 ++++++------------------
|
||||
1 file changed, 6 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/cipher/elgamal.c b/cipher/elgamal.c
|
||||
index 9835122..eead450 100644
|
||||
--- a/cipher/elgamal.c
|
||||
+++ b/cipher/elgamal.c
|
||||
@@ -66,7 +66,7 @@ static const char *elg_names[] =
|
||||
|
||||
|
||||
static int test_keys (ELG_secret_key *sk, unsigned int nbits, int nodie);
|
||||
-static gcry_mpi_t gen_k (gcry_mpi_t p, int small_k);
|
||||
+static gcry_mpi_t gen_k (gcry_mpi_t p);
|
||||
static gcry_err_code_t generate (ELG_secret_key *sk, unsigned nbits,
|
||||
gcry_mpi_t **factors);
|
||||
static int check_secret_key (ELG_secret_key *sk);
|
||||
@@ -189,11 +189,10 @@ test_keys ( ELG_secret_key *sk, unsigned int nbits, int nodie )
|
||||
|
||||
/****************
|
||||
* Generate a random secret exponent k from prime p, so that k is
|
||||
- * relatively prime to p-1. With SMALL_K set, k will be selected for
|
||||
- * better encryption performance - this must never be used signing!
|
||||
+ * relatively prime to p-1.
|
||||
*/
|
||||
static gcry_mpi_t
|
||||
-gen_k( gcry_mpi_t p, int small_k )
|
||||
+gen_k( gcry_mpi_t p )
|
||||
{
|
||||
gcry_mpi_t k = mpi_alloc_secure( 0 );
|
||||
gcry_mpi_t temp = mpi_alloc( mpi_get_nlimbs(p) );
|
||||
@@ -202,18 +201,7 @@ gen_k( gcry_mpi_t p, int small_k )
|
||||
unsigned int nbits, nbytes;
|
||||
char *rndbuf = NULL;
|
||||
|
||||
- if (small_k)
|
||||
- {
|
||||
- /* Using a k much lesser than p is sufficient for encryption and
|
||||
- * it greatly improves the encryption performance. We use
|
||||
- * Wiener's table and add a large safety margin. */
|
||||
- nbits = wiener_map( orig_nbits ) * 3 / 2;
|
||||
- if( nbits >= orig_nbits )
|
||||
- BUG();
|
||||
- }
|
||||
- else
|
||||
- nbits = orig_nbits;
|
||||
-
|
||||
+ nbits = orig_nbits;
|
||||
|
||||
nbytes = (nbits+7)/8;
|
||||
if( DBG_CIPHER )
|
||||
@@ -492,7 +480,7 @@ do_encrypt(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_public_key *pkey )
|
||||
* error code.
|
||||
*/
|
||||
|
||||
- k = gen_k( pkey->p, 1 );
|
||||
+ k = gen_k( pkey->p );
|
||||
mpi_powm (a, pkey->g, k, pkey->p);
|
||||
|
||||
/* b = (y^k * input) mod p
|
||||
@@ -608,7 +596,7 @@ sign(gcry_mpi_t a, gcry_mpi_t b, gcry_mpi_t input, ELG_secret_key *skey )
|
||||
*
|
||||
*/
|
||||
mpi_sub_ui(p_1, p_1, 1);
|
||||
- k = gen_k( skey->p, 0 /* no small K ! */ );
|
||||
+ k = gen_k( skey->p );
|
||||
mpi_powm( a, skey->g, k, skey->p );
|
||||
mpi_mul(t, skey->x, a );
|
||||
mpi_subm(t, input, t, p_1 );
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,730 +0,0 @@
|
||||
From 78cb95d8fbd76159c1162c4ff72643f2c9984bf6 Mon Sep 17 00:00:00 2001
|
||||
From: zhujianwei001 <zhujianwei7@huawei.com>
|
||||
Date: Fri, 13 Aug 2021 08:51:20 +0800
|
||||
Subject: [PATCH] add support sm3 md
|
||||
Reference: https://github.com/gpg/libgcrypt/commit/4423bf3cc4432b9bfe801ff74cb05e6f0dd3eccd#diff-4cfeaaa70bbeb65cd0cbb0bec58738e97bd585f3acb1f6ddc63cfa3a9abeb5dd
|
||||
Conflict: fetch sm3.c from 1.9.3 tag, but remove _gcry_sm3_hash_buffer, _gcry_sm3_hash_buffers in struct _gcry_digest_spec_sm3, adjust hd->bctx.blocksize init in sm3_init; add some build support
|
||||
|
||||
Add crypto hash SM3.
|
||||
* configure.ac (available_digests): Add sm3.
|
||||
* src/cipher.h: Add declarations for SM3.
|
||||
* cipher/Makefile.am (EXTRA_libcipher_la_SOURCES): Add sm3.c.
|
||||
* cipher/md.c [USE_SM3] (digest_list): Add _gcry_digest_spec_sm3.
|
||||
* cipher/pubkey-util.c (hashnames): Add "sm3".
|
||||
* cipher/sm3.c: New.
|
||||
* tests/basic.c (check_digests): Add test vectors for SM3.
|
||||
* tests/hashtest-256g.in (algos): Add SM3.
|
||||
* tests/hashtest.c (testvectors): Add for SM3.
|
||||
--
|
||||
GnuPG-bug-id: 3454
|
||||
Signed-off-by: Jia Zhang <qianyue.zj@alibaba-inc.com>
|
||||
---
|
||||
cipher/Makefile.am | 1 +
|
||||
cipher/md.c | 11 +
|
||||
cipher/pubkey-util.c | 1 +
|
||||
cipher/sm3.c | 472 +++++++++++++++++++++++++++++++++++++++++
|
||||
configure.ac | 7 +
|
||||
doc/gcrypt.texi | 4 +
|
||||
src/cipher.h | 7 +
|
||||
src/gcrypt.h.in | 3 +-
|
||||
tests/basic.c | 25 +++
|
||||
tests/hashtest-256g.in | 2 +-
|
||||
tests/hashtest.c | 11 +
|
||||
11 files changed, 542 insertions(+), 2 deletions(-)
|
||||
create mode 100644 cipher/sm3.c
|
||||
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
|
||||
index 85a5b5f..d44dfea 100644
|
||||
--- a/cipher/Makefile.am
|
||||
+++ b/cipher/Makefile.am
|
||||
@@ -97,6 +97,7 @@ sha256.c sha256-ssse3-amd64.S sha256-avx-amd64.S sha256-avx2-bmi2-amd64.S \
|
||||
sha256-armv8-aarch32-ce.S sha256-armv8-aarch64-ce.S \
|
||||
sha512.c sha512-ssse3-amd64.S sha512-avx-amd64.S sha512-avx2-bmi2-amd64.S \
|
||||
sha512-armv7-neon.S sha512-arm.S \
|
||||
+sm3.c \
|
||||
keccak.c keccak_permute_32.h keccak_permute_64.h keccak-armv7-neon.S \
|
||||
stribog.c \
|
||||
tiger.c \
|
||||
diff --git a/cipher/md.c b/cipher/md.c
|
||||
index 0d07854..13e3b3e 100644
|
||||
--- a/cipher/md.c
|
||||
+++ b/cipher/md.c
|
||||
@@ -94,6 +94,9 @@ static gcry_md_spec_t *digest_list[] =
|
||||
&_gcry_digest_spec_blake2s_224,
|
||||
&_gcry_digest_spec_blake2s_160,
|
||||
&_gcry_digest_spec_blake2s_128,
|
||||
+#endif
|
||||
+#if USE_SM3
|
||||
+ &_gcry_digest_spec_sm3,
|
||||
#endif
|
||||
NULL
|
||||
};
|
||||
@@ -1042,6 +1045,10 @@ _gcry_md_hash_buffer (int algo, void *digest,
|
||||
#if USE_RMD160
|
||||
else if (algo == GCRY_MD_RMD160 && !fips_mode () )
|
||||
_gcry_rmd160_hash_buffer (digest, buffer, length);
|
||||
+#endif
|
||||
+#if USE_SM3
|
||||
+ else if (algo == GCRY_MD_SM3)
|
||||
+ _gcry_sm3_hash_buffer (digest, buffer, length);
|
||||
#endif
|
||||
else
|
||||
{
|
||||
@@ -1115,6 +1122,10 @@ _gcry_md_hash_buffers (int algo, unsigned int flags, void *digest,
|
||||
#if USE_SHA1
|
||||
else if (algo == GCRY_MD_SHA1 && !hmac)
|
||||
_gcry_sha1_hash_buffers (digest, iov, iovcnt);
|
||||
+#endif
|
||||
+#if USE_SM3
|
||||
+ else if (algo == GCRY_MD_SM3 && !hmac)
|
||||
+ _gcry_sm3_hash_buffers (digest, iov, iovcnt);
|
||||
#endif
|
||||
else
|
||||
{
|
||||
diff --git a/cipher/pubkey-util.c b/cipher/pubkey-util.c
|
||||
index c40ef97..ae0e1c4 100644
|
||||
--- a/cipher/pubkey-util.c
|
||||
+++ b/cipher/pubkey-util.c
|
||||
@@ -221,6 +221,7 @@ get_hash_algo (const char *s, size_t n)
|
||||
{ "sha3-256", GCRY_MD_SHA3_256 },
|
||||
{ "sha3-384", GCRY_MD_SHA3_384 },
|
||||
{ "sha3-512", GCRY_MD_SHA3_512 },
|
||||
+ { "sm3", GCRY_MD_SM3 },
|
||||
{ NULL, 0 }
|
||||
};
|
||||
int algo;
|
||||
diff --git a/cipher/sm3.c b/cipher/sm3.c
|
||||
new file mode 100644
|
||||
index 0000000..274b14e
|
||||
--- /dev/null
|
||||
+++ b/cipher/sm3.c
|
||||
@@ -0,0 +1,472 @@
|
||||
+/* sm3.c - SM3 hash function
|
||||
+ * Copyright (C) 2017 Jia Zhang
|
||||
+ *
|
||||
+ * This file is part of Libgcrypt.
|
||||
+ *
|
||||
+ * Libgcrypt is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU Lesser General Public License as
|
||||
+ * published by the Free Software Foundation; either version 2.1 of
|
||||
+ * the License, or (at your option) any later version.
|
||||
+ *
|
||||
+ * Libgcrypt is distributed in the hope that it will be useful,
|
||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ * GNU Lesser General Public License for more details.
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU Lesser General Public
|
||||
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
+ */
|
||||
+
|
||||
+
|
||||
+/* Test vectors:
|
||||
+ *
|
||||
+ * "abc"
|
||||
+ * SM3: 66c7f0f4 62eeedd9 d1f2d46b dc10e4e2 4167c487 5cf2f7a2 297da02b 8f4ba8e0
|
||||
+ *
|
||||
+ * "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd"
|
||||
+ * SM3: debe9ff9 2275b8a1 38604889 c18e5a4d 6fdb70e5 387e5765 293dcba3 9c0c5732
|
||||
+ *
|
||||
+ * "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
|
||||
+ * SM3: 639b6cc5 e64d9e37 a390b192 df4fa1ea 0720ab74 7ff692b9 f38c4e66 ad7b8c05
|
||||
+ *
|
||||
+ * "a" one million times
|
||||
+ * SM3: c8aaf894 29554029 e231941a 2acc0ad6 1ff2a5ac d8fadd25 847a3a73 2b3b02c3
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+
|
||||
+#include <config.h>
|
||||
+#include <stdio.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
+
|
||||
+#include "g10lib.h"
|
||||
+#include "bithelp.h"
|
||||
+#include "bufhelp.h"
|
||||
+#include "cipher.h"
|
||||
+#include "hash-common.h"
|
||||
+
|
||||
+
|
||||
+typedef struct {
|
||||
+ gcry_md_block_ctx_t bctx;
|
||||
+ u32 h0,h1,h2,h3,h4,h5,h6,h7;
|
||||
+} SM3_CONTEXT;
|
||||
+
|
||||
+
|
||||
+static unsigned int
|
||||
+transform (void *c, const unsigned char *data, size_t nblks);
|
||||
+
|
||||
+
|
||||
+static void
|
||||
+sm3_init (void *context, unsigned int flags)
|
||||
+{
|
||||
+ SM3_CONTEXT *hd = context;
|
||||
+ unsigned int features = _gcry_get_hw_features ();
|
||||
+
|
||||
+ (void)flags;
|
||||
+
|
||||
+ hd->h0 = 0x7380166f;
|
||||
+ hd->h1 = 0x4914b2b9;
|
||||
+ hd->h2 = 0x172442d7;
|
||||
+ hd->h3 = 0xda8a0600;
|
||||
+ hd->h4 = 0xa96f30bc;
|
||||
+ hd->h5 = 0x163138aa;
|
||||
+ hd->h6 = 0xe38dee4d;
|
||||
+ hd->h7 = 0xb0fb0e4e;
|
||||
+
|
||||
+ hd->bctx.nblocks = 0;
|
||||
+ hd->bctx.nblocks_high = 0;
|
||||
+ hd->bctx.count = 0;
|
||||
+ hd->bctx.blocksize = 64;
|
||||
+ hd->bctx.bwrite = transform;
|
||||
+
|
||||
+ (void)features;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * Transform the message X which consists of 16 32-bit-words. See
|
||||
+ * GM/T 004-2012 for details. */
|
||||
+#define R(i,a,b,c,d,e,f,g,h,t,w1,w2) do \
|
||||
+ { \
|
||||
+ ss1 = rol ((rol ((a), 12) + (e) + (t)), 7); \
|
||||
+ ss2 = ss1 ^ rol ((a), 12); \
|
||||
+ d += FF##i(a,b,c) + ss2 + ((w1) ^ (w2)); \
|
||||
+ h += GG##i(e,f,g) + ss1 + (w1); \
|
||||
+ b = rol ((b), 9); \
|
||||
+ f = rol ((f), 19); \
|
||||
+ h = P0 ((h)); \
|
||||
+ } while (0)
|
||||
+
|
||||
+#define R1(a,b,c,d,e,f,g,h,t,w1,w2) R(1,a,b,c,d,e,f,g,h,t,w1,w2)
|
||||
+#define R2(a,b,c,d,e,f,g,h,t,w1,w2) R(2,a,b,c,d,e,f,g,h,t,w1,w2)
|
||||
+
|
||||
+#define FF1(x, y, z) (x ^ y ^ z)
|
||||
+
|
||||
+#define FF2(x, y, z) ((x & y) | (x & z) | (y & z))
|
||||
+
|
||||
+#define GG1(x, y, z) (x ^ y ^ z)
|
||||
+
|
||||
+#define GG2(x, y, z) ((x & y) | ( ~x & z))
|
||||
+
|
||||
+/* Message expansion */
|
||||
+#define P0(x) ((x) ^ rol ((x), 9) ^ rol ((x), 17))
|
||||
+#define P1(x) ((x) ^ rol ((x), 15) ^ rol ((x), 23))
|
||||
+#define I(i) ( w[i] = buf_get_be32(data + i * 4) )
|
||||
+#define W1(i) ( w[i&0x0f] )
|
||||
+#define W2(i) ( w[i&0x0f] = P1(w[i &0x0f] \
|
||||
+ ^ w[(i-9)&0x0f] \
|
||||
+ ^ rol (w[(i-3)&0x0f], 15)) \
|
||||
+ ^ rol (w[(i-13)&0x0f], 7) \
|
||||
+ ^ w[(i-6)&0x0f] )
|
||||
+
|
||||
+static unsigned int
|
||||
+transform_blk (void *ctx, const unsigned char *data)
|
||||
+{
|
||||
+ SM3_CONTEXT *hd = ctx;
|
||||
+ static const u32 K[64] = {
|
||||
+ 0x79cc4519, 0xf3988a32, 0xe7311465, 0xce6228cb,
|
||||
+ 0x9cc45197, 0x3988a32f, 0x7311465e, 0xe6228cbc,
|
||||
+ 0xcc451979, 0x988a32f3, 0x311465e7, 0x6228cbce,
|
||||
+ 0xc451979c, 0x88a32f39, 0x11465e73, 0x228cbce6,
|
||||
+ 0x9d8a7a87, 0x3b14f50f, 0x7629ea1e, 0xec53d43c,
|
||||
+ 0xd8a7a879, 0xb14f50f3, 0x629ea1e7, 0xc53d43ce,
|
||||
+ 0x8a7a879d, 0x14f50f3b, 0x29ea1e76, 0x53d43cec,
|
||||
+ 0xa7a879d8, 0x4f50f3b1, 0x9ea1e762, 0x3d43cec5,
|
||||
+ 0x7a879d8a, 0xf50f3b14, 0xea1e7629, 0xd43cec53,
|
||||
+ 0xa879d8a7, 0x50f3b14f, 0xa1e7629e, 0x43cec53d,
|
||||
+ 0x879d8a7a, 0x0f3b14f5, 0x1e7629ea, 0x3cec53d4,
|
||||
+ 0x79d8a7a8, 0xf3b14f50, 0xe7629ea1, 0xcec53d43,
|
||||
+ 0x9d8a7a87, 0x3b14f50f, 0x7629ea1e, 0xec53d43c,
|
||||
+ 0xd8a7a879, 0xb14f50f3, 0x629ea1e7, 0xc53d43ce,
|
||||
+ 0x8a7a879d, 0x14f50f3b, 0x29ea1e76, 0x53d43cec,
|
||||
+ 0xa7a879d8, 0x4f50f3b1, 0x9ea1e762, 0x3d43cec5
|
||||
+ };
|
||||
+
|
||||
+ u32 a,b,c,d,e,f,g,h,ss1,ss2;
|
||||
+ u32 w[16];
|
||||
+
|
||||
+ a = hd->h0;
|
||||
+ b = hd->h1;
|
||||
+ c = hd->h2;
|
||||
+ d = hd->h3;
|
||||
+ e = hd->h4;
|
||||
+ f = hd->h5;
|
||||
+ g = hd->h6;
|
||||
+ h = hd->h7;
|
||||
+
|
||||
+ R1(a, b, c, d, e, f, g, h, K[0], I(0), I(4));
|
||||
+ R1(d, a, b, c, h, e, f, g, K[1], I(1), I(5));
|
||||
+ R1(c, d, a, b, g, h, e, f, K[2], I(2), I(6));
|
||||
+ R1(b, c, d, a, f, g, h, e, K[3], I(3), I(7));
|
||||
+ R1(a, b, c, d, e, f, g, h, K[4], W1(4), I(8));
|
||||
+ R1(d, a, b, c, h, e, f, g, K[5], W1(5), I(9));
|
||||
+ R1(c, d, a, b, g, h, e, f, K[6], W1(6), I(10));
|
||||
+ R1(b, c, d, a, f, g, h, e, K[7], W1(7), I(11));
|
||||
+ R1(a, b, c, d, e, f, g, h, K[8], W1(8), I(12));
|
||||
+ R1(d, a, b, c, h, e, f, g, K[9], W1(9), I(13));
|
||||
+ R1(c, d, a, b, g, h, e, f, K[10], W1(10), I(14));
|
||||
+ R1(b, c, d, a, f, g, h, e, K[11], W1(11), I(15));
|
||||
+ R1(a, b, c, d, e, f, g, h, K[12], W1(12), W2(16));
|
||||
+ R1(d, a, b, c, h, e, f, g, K[13], W1(13), W2(17));
|
||||
+ R1(c, d, a, b, g, h, e, f, K[14], W1(14), W2(18));
|
||||
+ R1(b, c, d, a, f, g, h, e, K[15], W1(15), W2(19));
|
||||
+
|
||||
+ R2(a, b, c, d, e, f, g, h, K[16], W1(16), W2(20));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[17], W1(17), W2(21));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[18], W1(18), W2(22));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[19], W1(19), W2(23));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[20], W1(20), W2(24));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[21], W1(21), W2(25));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[22], W1(22), W2(26));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[23], W1(23), W2(27));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[24], W1(24), W2(28));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[25], W1(25), W2(29));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[26], W1(26), W2(30));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[27], W1(27), W2(31));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[28], W1(28), W2(32));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[29], W1(29), W2(33));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[30], W1(30), W2(34));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[31], W1(31), W2(35));
|
||||
+
|
||||
+ R2(a, b, c, d, e, f, g, h, K[32], W1(32), W2(36));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[33], W1(33), W2(37));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[34], W1(34), W2(38));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[35], W1(35), W2(39));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[36], W1(36), W2(40));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[37], W1(37), W2(41));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[38], W1(38), W2(42));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[39], W1(39), W2(43));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[40], W1(40), W2(44));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[41], W1(41), W2(45));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[42], W1(42), W2(46));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[43], W1(43), W2(47));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[44], W1(44), W2(48));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[45], W1(45), W2(49));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[46], W1(46), W2(50));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[47], W1(47), W2(51));
|
||||
+
|
||||
+ R2(a, b, c, d, e, f, g, h, K[48], W1(48), W2(52));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[49], W1(49), W2(53));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[50], W1(50), W2(54));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[51], W1(51), W2(55));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[52], W1(52), W2(56));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[53], W1(53), W2(57));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[54], W1(54), W2(58));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[55], W1(55), W2(59));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[56], W1(56), W2(60));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[57], W1(57), W2(61));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[58], W1(58), W2(62));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[59], W1(59), W2(63));
|
||||
+ R2(a, b, c, d, e, f, g, h, K[60], W1(60), W2(64));
|
||||
+ R2(d, a, b, c, h, e, f, g, K[61], W1(61), W2(65));
|
||||
+ R2(c, d, a, b, g, h, e, f, K[62], W1(62), W2(66));
|
||||
+ R2(b, c, d, a, f, g, h, e, K[63], W1(63), W2(67));
|
||||
+
|
||||
+ hd->h0 ^= a;
|
||||
+ hd->h1 ^= b;
|
||||
+ hd->h2 ^= c;
|
||||
+ hd->h3 ^= d;
|
||||
+ hd->h4 ^= e;
|
||||
+ hd->h5 ^= f;
|
||||
+ hd->h6 ^= g;
|
||||
+ hd->h7 ^= h;
|
||||
+
|
||||
+ return /*burn_stack*/ 26*4+32;
|
||||
+}
|
||||
+#undef P0
|
||||
+#undef P1
|
||||
+#undef R
|
||||
+#undef R1
|
||||
+#undef R2
|
||||
+
|
||||
+static unsigned int
|
||||
+transform (void *ctx, const unsigned char *data, size_t nblks)
|
||||
+{
|
||||
+ SM3_CONTEXT *hd = ctx;
|
||||
+ unsigned int burn;
|
||||
+
|
||||
+ do
|
||||
+ {
|
||||
+ burn = transform_blk (hd, data);
|
||||
+ data += 64;
|
||||
+ }
|
||||
+ while (--nblks);
|
||||
+
|
||||
+ return burn;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * The routine finally terminates the computation and returns the
|
||||
+ * digest. The handle is prepared for a new cycle, but adding bytes
|
||||
+ * to the handle will the destroy the returned buffer. Returns: 32
|
||||
+ * bytes with the message the digest. */
|
||||
+static void
|
||||
+sm3_final(void *context)
|
||||
+{
|
||||
+ SM3_CONTEXT *hd = context;
|
||||
+ u32 t, th, msb, lsb;
|
||||
+ byte *p;
|
||||
+ unsigned int burn;
|
||||
+
|
||||
+ t = hd->bctx.nblocks;
|
||||
+ if (sizeof t == sizeof hd->bctx.nblocks)
|
||||
+ th = hd->bctx.nblocks_high;
|
||||
+ else
|
||||
+ th = hd->bctx.nblocks >> 32;
|
||||
+
|
||||
+ /* multiply by 64 to make a byte count */
|
||||
+ lsb = t << 6;
|
||||
+ msb = (th << 6) | (t >> 26);
|
||||
+ /* add the count */
|
||||
+ t = lsb;
|
||||
+ if ((lsb += hd->bctx.count) < t)
|
||||
+ msb++;
|
||||
+ /* multiply by 8 to make a bit count */
|
||||
+ t = lsb;
|
||||
+ lsb <<= 3;
|
||||
+ msb <<= 3;
|
||||
+ msb |= t >> 29;
|
||||
+
|
||||
+ if (hd->bctx.count < 56) /* enough room */
|
||||
+ {
|
||||
+ hd->bctx.buf[hd->bctx.count++] = 0x80; /* pad */
|
||||
+ if (hd->bctx.count < 56)
|
||||
+ memset (&hd->bctx.buf[hd->bctx.count], 0, 56 - hd->bctx.count);
|
||||
+
|
||||
+ /* append the 64 bit count */
|
||||
+ buf_put_be32(hd->bctx.buf + 56, msb);
|
||||
+ buf_put_be32(hd->bctx.buf + 60, lsb);
|
||||
+ burn = (*hd->bctx.bwrite) ( hd, hd->bctx.buf, 1 );
|
||||
+ }
|
||||
+ else /* need one extra block */
|
||||
+ {
|
||||
+ hd->bctx.buf[hd->bctx.count++] = 0x80; /* pad character */
|
||||
+ /* fill pad and next block with zeroes */
|
||||
+ memset (&hd->bctx.buf[hd->bctx.count], 0, 64 - hd->bctx.count + 56);
|
||||
+
|
||||
+ /* append the 64 bit count */
|
||||
+ buf_put_be32(hd->bctx.buf + 64 + 56, msb);
|
||||
+ buf_put_be32(hd->bctx.buf + 64 + 60, lsb);
|
||||
+ burn = (*hd->bctx.bwrite) ( hd, hd->bctx.buf, 2 );
|
||||
+ }
|
||||
+
|
||||
+ p = hd->bctx.buf;
|
||||
+#define X(a) do { buf_put_be32(p, hd->h##a); p += 4; } while(0)
|
||||
+ X(0);
|
||||
+ X(1);
|
||||
+ X(2);
|
||||
+ X(3);
|
||||
+ X(4);
|
||||
+ X(5);
|
||||
+ X(6);
|
||||
+ X(7);
|
||||
+#undef X
|
||||
+
|
||||
+ hd->bctx.count = 0;
|
||||
+
|
||||
+ _gcry_burn_stack (burn);
|
||||
+}
|
||||
+
|
||||
+static byte *
|
||||
+sm3_read (void *context)
|
||||
+{
|
||||
+ SM3_CONTEXT *hd = context;
|
||||
+
|
||||
+ return hd->bctx.buf;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/* Shortcut functions which puts the hash value of the supplied buffer
|
||||
+ * into outbuf which must have a size of 32 bytes. */
|
||||
+void
|
||||
+_gcry_sm3_hash_buffer (void *outbuf, const void *buffer, size_t length)
|
||||
+{
|
||||
+ SM3_CONTEXT hd;
|
||||
+
|
||||
+ sm3_init (&hd, 0);
|
||||
+ _gcry_md_block_write (&hd, buffer, length);
|
||||
+ sm3_final (&hd);
|
||||
+ memcpy (outbuf, hd.bctx.buf, 32);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/* Variant of the above shortcut function using multiple buffers. */
|
||||
+void
|
||||
+_gcry_sm3_hash_buffers (void *outbuf, const gcry_buffer_t *iov, int iovcnt)
|
||||
+{
|
||||
+ SM3_CONTEXT hd;
|
||||
+
|
||||
+ sm3_init (&hd, 0);
|
||||
+ for (;iovcnt > 0; iov++, iovcnt--)
|
||||
+ _gcry_md_block_write (&hd,
|
||||
+ (const char*)iov[0].data + iov[0].off, iov[0].len);
|
||||
+ sm3_final (&hd);
|
||||
+ memcpy (outbuf, hd.bctx.buf, 32);
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * Self-test section.
|
||||
+ */
|
||||
+
|
||||
+
|
||||
+static gpg_err_code_t
|
||||
+selftests_sm3 (int extended, selftest_report_func_t report)
|
||||
+{
|
||||
+ const char *what;
|
||||
+ const char *errtxt;
|
||||
+
|
||||
+ what = "short string (spec example 1)";
|
||||
+ errtxt = _gcry_hash_selftest_check_one
|
||||
+ (GCRY_MD_SM3, 0,
|
||||
+ "abc", 3,
|
||||
+ "\x66\xc7\xf0\xf4\x62\xee\xed\xd9\xd1\xf2\xd4\x6b\xdc\x10\xe4\xe2"
|
||||
+ "\x41\x67\xc4\x87\x5c\xf2\xf7\xa2\x29\x7d\xa0\x2b\x8f\x4b\xa8\xe0", 32);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ if (extended)
|
||||
+ {
|
||||
+ what = "long string (spec example 2)";
|
||||
+ errtxt = _gcry_hash_selftest_check_one
|
||||
+ (GCRY_MD_SM3, 0,
|
||||
+ "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd", 64,
|
||||
+ "\xde\xbe\x9f\xf9\x22\x75\xb8\xa1\x38\x60\x48\x89\xc1\x8e\x5a\x4d"
|
||||
+ "\x6f\xdb\x70\xe5\x38\x7e\x57\x65\x29\x3d\xcb\xa3\x9c\x0c\x57\x32",
|
||||
+ 32);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ what = "long string";
|
||||
+ errtxt = _gcry_hash_selftest_check_one
|
||||
+ (GCRY_MD_SM3, 0,
|
||||
+ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", 56,
|
||||
+ "\x63\x9b\x6c\xc5\xe6\x4d\x9e\x37\xa3\x90\xb1\x92\xdf\x4f\xa1\xea"
|
||||
+ "\x07\x20\xab\x74\x7f\xf6\x92\xb9\xf3\x8c\x4e\x66\xad\x7b\x8c\x05",
|
||||
+ 32);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ what = "one million \"a\"";
|
||||
+ errtxt = _gcry_hash_selftest_check_one
|
||||
+ (GCRY_MD_SM3, 1,
|
||||
+ NULL, 0,
|
||||
+ "\xc8\xaa\xf8\x94\x29\x55\x40\x29\xe2\x31\x94\x1a\x2a\xcc\x0a\xd6"
|
||||
+ "\x1f\xf2\xa5\xac\xd8\xfa\xdd\x25\x84\x7a\x3a\x73\x2b\x3b\x02\xc3",
|
||||
+ 32);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+ }
|
||||
+
|
||||
+ return 0; /* Succeeded. */
|
||||
+
|
||||
+ failed:
|
||||
+ if (report)
|
||||
+ report ("digest", GCRY_MD_SM3, what, errtxt);
|
||||
+ return GPG_ERR_SELFTEST_FAILED;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/* Run a full self-test for ALGO and return 0 on success. */
|
||||
+static gpg_err_code_t
|
||||
+run_selftests (int algo, int extended, selftest_report_func_t report)
|
||||
+{
|
||||
+ gpg_err_code_t ec;
|
||||
+
|
||||
+ switch (algo)
|
||||
+ {
|
||||
+ case GCRY_MD_SM3:
|
||||
+ ec = selftests_sm3 (extended, report);
|
||||
+ break;
|
||||
+ default:
|
||||
+ ec = GPG_ERR_DIGEST_ALGO;
|
||||
+ break;
|
||||
+
|
||||
+ }
|
||||
+ return ec;
|
||||
+}
|
||||
+
|
||||
+static byte asn_sm3[] = /* Object ID is 1.2.156.10197.401 */
|
||||
+ { 0x30, 0x2F, 0x30, 0x0B, 0x06, 0x07, 0x2A, 0x81,
|
||||
+ 0x1C, 0xCF, 0x55, 0x83, 0x11, 0x05, 0x00, 0x04,
|
||||
+ 0x20 };
|
||||
+
|
||||
+static gcry_md_oid_spec_t oid_spec_sm3[] =
|
||||
+ {
|
||||
+ /* China Electronics Standardization Instutute,
|
||||
+ OID White paper (2015), Table 6 */
|
||||
+ { "1.2.156.10197.401" },
|
||||
+ { NULL },
|
||||
+ };
|
||||
+
|
||||
+gcry_md_spec_t _gcry_digest_spec_sm3 =
|
||||
+ {
|
||||
+ GCRY_MD_SM3, {0, 0},
|
||||
+ "SM3", asn_sm3, DIM (asn_sm3), oid_spec_sm3, 32,
|
||||
+ sm3_init, _gcry_md_block_write, sm3_final, sm3_read, NULL,
|
||||
+ sizeof (SM3_CONTEXT),
|
||||
+ run_selftests
|
||||
+ };
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c588af4..d52b61f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -204,6 +204,7 @@ enabled_pubkey_ciphers=""
|
||||
# Definitions for message digests.
|
||||
available_digests="crc gostr3411-94 md2 md4 md5 rmd160 sha1 sha256 sha512"
|
||||
available_digests="$available_digests sha3 tiger whirlpool stribog blake2"
|
||||
+available_digests="$available_digests sm3"
|
||||
enabled_digests=""
|
||||
|
||||
# Definitions for kdfs (optional ones)
|
||||
@@ -2603,6 +2604,12 @@ case "${host}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
+LIST_MEMBER(sm3, $enabled_digests)
|
||||
+if test "$found" = "1" ; then
|
||||
+ GCRYPT_DIGESTS="$GCRYPT_DIGESTS sm3.lo"
|
||||
+ AC_DEFINE(USE_SM3, 1, [Defined if this module should be included])
|
||||
+fi
|
||||
+
|
||||
LIST_MEMBER(scrypt, $enabled_kdfs)
|
||||
if test "$found" = "1" ; then
|
||||
GCRYPT_KDFS="$GCRYPT_KDFS scrypt.lo"
|
||||
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
|
||||
index 7cd1b0f..8119e89 100644
|
||||
--- a/doc/gcrypt.texi
|
||||
+++ b/doc/gcrypt.texi
|
||||
@@ -3122,6 +3122,7 @@ are also supported.
|
||||
@cindex MD2, MD4, MD5
|
||||
@cindex TIGER, TIGER1, TIGER2
|
||||
@cindex HAVAL
|
||||
+@cindex SM3
|
||||
@cindex Whirlpool
|
||||
@cindex BLAKE2b-512, BLAKE2b-384, BLAKE2b-256, BLAKE2b-160
|
||||
@cindex BLAKE2s-256, BLAKE2s-224, BLAKE2s-160, BLAKE2s-128
|
||||
@@ -3281,6 +3282,9 @@ See RFC 7693 for the specification.
|
||||
This is the BLAKE2s-128 algorithm which yields a message digest of 16 bytes.
|
||||
See RFC 7693 for the specification.
|
||||
|
||||
+@item GCRY_MD_SM3
|
||||
+This is the SM3 algorithm which yields a message digest of 32 bytes.
|
||||
+
|
||||
@end table
|
||||
@c end table of hash algorithms
|
||||
|
||||
diff --git a/src/cipher.h b/src/cipher.h
|
||||
index d9e0ac6..7c2e5d9 100644
|
||||
--- a/src/cipher.h
|
||||
+++ b/src/cipher.h
|
||||
@@ -133,6 +133,12 @@ void _gcry_sha512_hash_buffer (void *outbuf,
|
||||
void _gcry_sha512_hash_buffers (void *outbuf,
|
||||
const gcry_buffer_t *iov, int iovcnt);
|
||||
|
||||
+/*-- sm3.c --*/
|
||||
+void _gcry_sm3_hash_buffer (void *outbuf,
|
||||
+ const void *buffer, size_t length);
|
||||
+void _gcry_sm3_hash_buffers (void *outbuf,
|
||||
+ const gcry_buffer_t *iov, int iovcnt);
|
||||
+
|
||||
/*-- blake2.c --*/
|
||||
gcry_err_code_t _gcry_blake2_init_with_key(void *ctx, unsigned int flags,
|
||||
const unsigned char *key,
|
||||
@@ -329,6 +335,7 @@ extern gcry_md_spec_t _gcry_digest_spec_blake2s_256;
|
||||
extern gcry_md_spec_t _gcry_digest_spec_blake2s_224;
|
||||
extern gcry_md_spec_t _gcry_digest_spec_blake2s_160;
|
||||
extern gcry_md_spec_t _gcry_digest_spec_blake2s_128;
|
||||
+extern gcry_md_spec_t _gcry_digest_spec_sm3;
|
||||
|
||||
/* Declarations for the pubkey cipher specifications. */
|
||||
extern gcry_pk_spec_t _gcry_pubkey_spec_rsa;
|
||||
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
|
||||
index 75c49a0..72b09a9 100644
|
||||
--- a/src/gcrypt.h.in
|
||||
+++ b/src/gcrypt.h.in
|
||||
@@ -1240,7 +1240,8 @@ enum gcry_md_algos
|
||||
GCRY_MD_BLAKE2S_256 = 322,
|
||||
GCRY_MD_BLAKE2S_224 = 323,
|
||||
GCRY_MD_BLAKE2S_160 = 324,
|
||||
- GCRY_MD_BLAKE2S_128 = 325
|
||||
+ GCRY_MD_BLAKE2S_128 = 325,
|
||||
+ GCRY_MD_SM3 = 326,
|
||||
};
|
||||
|
||||
/* Flags used with the open function. */
|
||||
diff --git a/tests/basic.c b/tests/basic.c
|
||||
index 0bd8020..f932b2b 100644
|
||||
--- a/tests/basic.c
|
||||
+++ b/tests/basic.c
|
||||
@@ -8457,6 +8457,31 @@ check_digests (void)
|
||||
"\x0e\xfc\x29\xde" },
|
||||
{ GCRY_MD_BLAKE2S_128, "?",
|
||||
"\x70\x0b\x8a\x71\x1d\x34\x0a\xf0\x13\x93\x19\x93\x5e\xd7\x54\x9c" },
|
||||
+
|
||||
+ { GCRY_MD_SM3, "abc",
|
||||
+ "\x66\xc7\xf0\xf4\x62\xee\xed\xd9\xd1\xf2\xd4\x6b\xdc\x10\xe4\xe2"
|
||||
+ "\x41\x67\xc4\x87\x5c\xf2\xf7\xa2\x29\x7d\xa0\x2b\x8f\x4b\xa8\xe0" },
|
||||
+ { GCRY_MD_SM3,
|
||||
+ "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
|
||||
+ "\x63\x9b\x6c\xc5\xe6\x4d\x9e\x37\xa3\x90\xb1\x92\xdf\x4f\xa1\xea"
|
||||
+ "\x07\x20\xab\x74\x7f\xf6\x92\xb9\xf3\x8c\x4e\x66\xad\x7b\x8c\x05" },
|
||||
+ { GCRY_MD_SM3, "!",
|
||||
+ "\xc8\xaa\xf8\x94\x29\x55\x40\x29\xe2\x31\x94\x1a\x2a\xcc\x0a\xd6"
|
||||
+ "\x1f\xf2\xa5\xac\xd8\xfa\xdd\x25\x84\x7a\x3a\x73\x2b\x3b\x02\xc3" },
|
||||
+ { GCRY_MD_SM3, "?",
|
||||
+ "\x3a\x3f\x53\xfc\x96\xc2\xde\xb2\xd9\x12\x3a\x1b\xd8\x47\x71\x28"
|
||||
+ "\xbc\x5d\x5e\x94\xea\x08\x86\x3d\xfb\xe4\x00\x5a\xd9\xed\x79\x26" },
|
||||
+ { GCRY_MD_SM3,
|
||||
+ "Libgcrypt is free software; you can redistribute it and/or modif"
|
||||
+ "y it under the terms of the GNU Lesser general Public License as"
|
||||
+ " published by the Free Software Foundation; either version 2.1 o"
|
||||
+ "f the License, or (at your option) any later version.\nLibgcrypt"
|
||||
+ " is distributed in the hope that it will be useful, but WITHOUT "
|
||||
+ "ANY WARRANTY; without even the implied warranty of MERCHANTABILI"
|
||||
+ "TY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser Gene"
|
||||
+ "ral Public License for more details.",
|
||||
+ "\x8b\x91\x3f\x0e\x85\xae\x43\x25\x6d\x28\x38\x6c\x09\x5c\xc7\x72"
|
||||
+ "\xcc\x2e\x78\x89\x7e\x2e\x4e\x5a\x3d\xf6\x55\xfe\x87\xbe\xa6\xbc" },
|
||||
{ 0 }
|
||||
};
|
||||
gcry_error_t err;
|
||||
diff --git a/tests/hashtest-256g.in b/tests/hashtest-256g.in
|
||||
index 92b1c1b..a52b869 100755
|
||||
--- a/tests/hashtest-256g.in
|
||||
+++ b/tests/hashtest-256g.in
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
|
||||
-algos="SHA1 SHA256 SHA512"
|
||||
+algos="SHA1 SHA256 SHA512 SM3"
|
||||
|
||||
test "@RUN_LARGE_DATA_TESTS@" = yes || exit 77
|
||||
echo " now running 256 GiB tests for $algos - this takes looong"
|
||||
diff --git a/tests/hashtest.c b/tests/hashtest.c
|
||||
index 2ecbc1f..3394594 100644
|
||||
--- a/tests/hashtest.c
|
||||
+++ b/tests/hashtest.c
|
||||
@@ -102,6 +102,17 @@ static struct {
|
||||
"0c91b91665ceaf7af5102e0ed31aa4f050668ab3c57b1f4763946d567efe66b3"
|
||||
"ab9a2016cf238dee5b44eae9f0cdfbf7b7a6eb1e759986273243dc35894706b6" },
|
||||
|
||||
+ { GCRY_MD_SM3, 256, -64,
|
||||
+ "4ceb893abeb43965d4cac7626da9a4be895585b5b2f16f302626801308b1c02a" },
|
||||
+ { GCRY_MD_SM3, 256, -1,
|
||||
+ "825f01e4f2b6084136abc356fa1b343a9411d844a4dc1474293aad817cd2a48f" },
|
||||
+ { GCRY_MD_SM3, 256, +0,
|
||||
+ "d948a4025ac3ea0aa8989f43203411bd22ad17eaa5fd92ebdf9cabf869f1ba1b" },
|
||||
+ { GCRY_MD_SM3, 256, +1,
|
||||
+ "4f6d0e260299c1f286ef1dbb4638a0770979f266b6c007c55410ee6849cba2a8" },
|
||||
+ { GCRY_MD_SM3, 256, +64,
|
||||
+ "ed34869dbadd62e3bec1f511004d7bbfc9cafa965477cc48843b248293bbe867" },
|
||||
+
|
||||
{ 0 }
|
||||
};
|
||||
|
||||
--
|
||||
2.19.1
|
||||
@ -50,7 +50,7 @@ diff -up libgcrypt-1.8.3/src/global.c.fips-ctor libgcrypt-1.8.3/src/global.c
|
||||
break;
|
||||
|
||||
case GCRYCTL_SET_ENFORCED_FIPS_FLAG:
|
||||
- if (!any_init_done)
|
||||
- if (!_gcry_global_any_init_done)
|
||||
+ if (fips_mode ())
|
||||
{
|
||||
- /* Not yet initialized at all. Set the enforced fips mode flag */
|
||||
@ -58,3 +58,16 @@ diff -up libgcrypt-1.8.3/src/global.c.fips-ctor libgcrypt-1.8.3/src/global.c
|
||||
_gcry_set_preferred_rng_type (0);
|
||||
_gcry_set_enforced_fips_mode ();
|
||||
}
|
||||
diff --git a/tests/t-secmem.c b/tests/t-secmem.c
|
||||
index 2b769134..1d33bbfd 100644
|
||||
--- a/tests/t-secmem.c
|
||||
+++ b/tests/t-secmem.c
|
||||
@@ -54,7 +54,7 @@ test_secmem (void)
|
||||
|
||||
/* Allocating another 2k should fail for the default 16k pool. */
|
||||
b = gcry_malloc_secure (chunk_size*4);
|
||||
- if (b)
|
||||
+ if (b && !gcry_fips_mode_active ())
|
||||
fail ("allocation did not fail as expected\n");
|
||||
|
||||
for (i=0; i < DIM(a); i++)
|
||||
@ -2,7 +2,7 @@ diff -up libgcrypt-1.8.3/random/random-drbg.c.fips-enttest libgcrypt-1.8.3/rando
|
||||
--- libgcrypt-1.8.3/random/random-drbg.c.fips-enttest 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.3/random/random-drbg.c 2019-06-24 10:04:23.219547141 +0200
|
||||
@@ -317,6 +317,7 @@ struct drbg_state_s
|
||||
unsigned char *ctr_null; /* CTR mode zero buffer */
|
||||
gcry_cipher_hd_t ctr_handle; /* CTR mode cipher handle */
|
||||
int seeded:1; /* DRBG fully seeded? */
|
||||
int pr:1; /* Prediction resistance enabled? */
|
||||
+ int ent_primed:1; /* Previous entropy data primed? */
|
||||
37
backport-libgcrypt-1.8.3-md-fips-enforce.patch
Normal file
37
backport-libgcrypt-1.8.3-md-fips-enforce.patch
Normal file
@ -0,0 +1,37 @@
|
||||
diff -up libgcrypt-1.8.3/cipher/md.c.fips-enforce libgcrypt-1.8.3/cipher/md.c
|
||||
--- libgcrypt-1.8.3/cipher/md.c.fips-enforce 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.3/cipher/md.c 2020-04-17 15:07:31.364945130 +0200
|
||||
@@ -409,13 +409,10 @@ md_enable (gcry_md_hd_t hd, int algorith
|
||||
}
|
||||
|
||||
|
||||
- if (!err && algorithm == GCRY_MD_MD5 && fips_mode ())
|
||||
+ if (!err && !spec->flags.fips && fips_mode ())
|
||||
{
|
||||
- _gcry_inactivate_fips_mode ("MD5 used");
|
||||
if (_gcry_enforced_fips_mode () )
|
||||
{
|
||||
- /* We should never get to here because we do not register
|
||||
- MD5 in enforced fips mode. But better throw an error. */
|
||||
err = GPG_ERR_DIGEST_ALGO;
|
||||
}
|
||||
}
|
||||
diff --git a/tests/t-kdf.c b/tests/t-kdf.c
|
||||
index 7a48e98a..48309b9a 100644
|
||||
--- a/tests/t-kdf.c
|
||||
+++ b/tests/t-kdf.c
|
||||
@@ -1104,6 +1104,13 @@ check_pbkdf2 (void)
|
||||
GCRY_KDF_PBKDF2, tv[tvidx].hashalgo,
|
||||
tv[tvidx].salt, tv[tvidx].saltlen,
|
||||
tv[tvidx].c, tv[tvidx].dklen, outbuf);
|
||||
+ if (gcry_fips_mode_active() && tvidx > 6)
|
||||
+ {
|
||||
+ if (!err)
|
||||
+ fail ("pbkdf2 test %d unexpectedly passed in FIPS mode: %s\n",
|
||||
+ tvidx, gpg_strerror (err));
|
||||
+ continue;
|
||||
+ }
|
||||
if (err)
|
||||
fail ("pbkdf2 test %d failed: %s\n", tvidx, gpg_strerror (err));
|
||||
else if (memcmp (outbuf, tv[tvidx].dk, tv[tvidx].dklen))
|
||||
|
||||
@ -1,16 +1,15 @@
|
||||
diff -up libgcrypt-1.8.4/cipher/dsa.c.fips-keygen libgcrypt-1.8.4/cipher/dsa.c
|
||||
--- libgcrypt-1.8.4/cipher/dsa.c.fips-keygen 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.4/cipher/dsa.c 2019-02-12 14:29:25.629513989 +0100
|
||||
@@ -457,11 +457,22 @@ generate_fips186 (DSA_secret_key *sk, un
|
||||
@@ -457,13 +457,22 @@ generate_fips186 (DSA_secret_key *sk, un
|
||||
&prime_q, &prime_p,
|
||||
r_counter,
|
||||
r_seed, r_seedlen);
|
||||
- else
|
||||
- ec = _gcry_generate_fips186_3_prime (nbits, qbits, NULL, 0,
|
||||
+ else if (!domain->p || !domain->q)
|
||||
+ ec = _gcry_generate_fips186_3_prime (nbits, qbits,
|
||||
+ initial_seed.seed,
|
||||
+ initial_seed.seedlen,
|
||||
ec = _gcry_generate_fips186_3_prime (nbits, qbits,
|
||||
initial_seed.seed,
|
||||
initial_seed.seedlen,
|
||||
&prime_q, &prime_p,
|
||||
r_counter,
|
||||
r_seed, r_seedlen, NULL);
|
||||
@ -2,7 +2,7 @@ diff -up libgcrypt-1.8.4/tests/basic.c.tests-fipsmode libgcrypt-1.8.4/tests/basi
|
||||
--- libgcrypt-1.8.4/tests/basic.c.tests-fipsmode 2018-04-17 17:29:40.000000000 +0200
|
||||
+++ libgcrypt-1.8.4/tests/basic.c 2019-02-12 13:30:48.935791024 +0100
|
||||
@@ -6964,7 +6964,7 @@ check_ciphers (void)
|
||||
check_one_cipher (algos[i], GCRY_CIPHER_MODE_CTR, 0);
|
||||
check_one_cipher (algos[i], GCRY_CIPHER_MODE_EAX, 0);
|
||||
if (gcry_cipher_get_algo_blklen (algos[i]) == GCRY_CCM_BLOCK_LEN)
|
||||
check_one_cipher (algos[i], GCRY_CIPHER_MODE_CCM, 0);
|
||||
- if (gcry_cipher_get_algo_blklen (algos[i]) == GCRY_GCM_BLOCK_LEN)
|
||||
@ -10,7 +10,7 @@ diff -up libgcrypt-1.8.4/tests/basic.c.tests-fipsmode libgcrypt-1.8.4/tests/basi
|
||||
check_one_cipher (algos[i], GCRY_CIPHER_MODE_GCM, 0);
|
||||
if (gcry_cipher_get_algo_blklen (algos[i]) == GCRY_OCB_BLOCK_LEN)
|
||||
check_one_cipher (algos[i], GCRY_CIPHER_MODE_OCB, 0);
|
||||
@@ -7010,11 +7010,17 @@ check_cipher_modes(void)
|
||||
@@ -7010,12 +7010,18 @@ check_cipher_modes(void)
|
||||
check_cfb_cipher ();
|
||||
check_ofb_cipher ();
|
||||
check_ccm_cipher ();
|
||||
@ -24,6 +24,7 @@ diff -up libgcrypt-1.8.4/tests/basic.c.tests-fipsmode libgcrypt-1.8.4/tests/basi
|
||||
+ check_ocb_cipher ();
|
||||
+ }
|
||||
check_xts_cipher ();
|
||||
check_eax_cipher ();
|
||||
- check_gost28147_cipher ();
|
||||
+ if (!in_fips_mode)
|
||||
+ {
|
||||
@ -46,7 +47,7 @@ diff -up libgcrypt-1.8.4/tests/basic.c.tests-fipsmode libgcrypt-1.8.4/tests/basi
|
||||
gcry_md_hd_t md;
|
||||
|
||||
- /* First trigger a self-test. */
|
||||
- xgcry_control (GCRYCTL_FORCE_FIPS_MODE, 0);
|
||||
- xgcry_control ((GCRYCTL_FORCE_FIPS_MODE, 0));
|
||||
if (!gcry_control (GCRYCTL_OPERATIONAL_P, 0))
|
||||
fail ("not in operational state after self-test\n");
|
||||
|
||||
@ -58,7 +59,7 @@ diff -up libgcrypt-1.8.4/tests/basic.c.tests-fipsmode libgcrypt-1.8.4/tests/basi
|
||||
- {
|
||||
- /* Now run a self-test and to get back into
|
||||
- operational state. */
|
||||
- xgcry_control (GCRYCTL_FORCE_FIPS_MODE, 0);
|
||||
- xgcry_control ((GCRYCTL_FORCE_FIPS_MODE, 0));
|
||||
- if (!gcry_control (GCRYCTL_OPERATIONAL_P, 0))
|
||||
- fail ("did not reach operational after error "
|
||||
- "and self-test\n");
|
||||
@ -70,7 +71,7 @@ diff -up libgcrypt-1.8.4/tests/benchmark.c.tests-fipsmode libgcrypt-1.8.4/tests/
|
||||
--- libgcrypt-1.8.4/tests/benchmark.c.tests-fipsmode 2019-02-12 11:31:44.859603883 +0100
|
||||
+++ libgcrypt-1.8.4/tests/benchmark.c 2019-02-12 14:10:40.271999352 +0100
|
||||
@@ -872,8 +872,10 @@ cipher_bench ( const char *algoname )
|
||||
|| (blklen == 1 && modes[modeidx].mode != GCRY_CIPHER_MODE_STREAM))
|
||||
&& algo != GCRY_CIPHER_CHACHA20)
|
||||
continue;
|
||||
|
||||
- if (modes[modeidx].req_blocksize > 0
|
||||
@ -141,7 +142,7 @@ diff -up libgcrypt-1.8.4/tests/pubkey.c.tests-fipsmode libgcrypt-1.8.4/tests/pub
|
||||
" (use-fips186)"
|
||||
" (transient-key)"
|
||||
" (derive-parms"
|
||||
- " (seed #0cb1990c1fd3626055d7a0096f8fa99807399871#))))",
|
||||
- " (seed #f770a4598ff756931fc529764513b103ce57d85f4ad8c5cf297c9b4d48241c5b#))))",
|
||||
+ " (seed #8b4c4d671fff82e8ed932260206d0571e3a1c2cee8cd94cb73fe58f9b67488fa#))))",
|
||||
0, 1);
|
||||
if (rc)
|
||||
@ -150,9 +151,9 @@ diff -up libgcrypt-1.8.4/tests/t-cv25519.c.tests-fipsmode libgcrypt-1.8.4/tests/
|
||||
--- libgcrypt-1.8.4/tests/t-cv25519.c.tests-fipsmode 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.4/tests/t-cv25519.c 2019-02-12 14:02:35.935705390 +0100
|
||||
@@ -560,6 +560,9 @@ main (int argc, char **argv)
|
||||
xgcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u , 0);
|
||||
xgcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
|
||||
xgcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
|
||||
xgcry_control ((GCRYCTL_SET_DEBUG_FLAGS, 1u , 0));
|
||||
xgcry_control ((GCRYCTL_ENABLE_QUICK_RANDOM, 0));
|
||||
xgcry_control ((GCRYCTL_INITIALIZATION_FINISHED, 0));
|
||||
+ /* Curve25519 isn't supported in fips mode */
|
||||
+ if (gcry_fips_mode_active())
|
||||
+ return 77;
|
||||
@ -163,13 +164,13 @@ diff -up libgcrypt-1.8.4/tests/t-secmem.c.tests-fipsmode libgcrypt-1.8.4/tests/t
|
||||
--- libgcrypt-1.8.4/tests/t-secmem.c.tests-fipsmode 2017-11-23 19:19:54.000000000 +0100
|
||||
+++ libgcrypt-1.8.4/tests/t-secmem.c 2019-02-12 11:51:02.462190538 +0100
|
||||
@@ -174,7 +174,8 @@ main (int argc, char **argv)
|
||||
xgcry_control (GCRYCTL_SET_DEBUG_FLAGS, 1u , 0);
|
||||
xgcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
|
||||
xgcry_control (GCRYCTL_INIT_SECMEM, pool_size, 0);
|
||||
xgcry_control ((GCRYCTL_SET_DEBUG_FLAGS, 1u , 0));
|
||||
xgcry_control ((GCRYCTL_ENABLE_QUICK_RANDOM, 0));
|
||||
xgcry_control ((GCRYCTL_INIT_SECMEM, pool_size, 0));
|
||||
- gcry_set_outofcore_handler (outofcore_handler, NULL);
|
||||
+ if (!gcry_fips_mode_active ())
|
||||
+ gcry_set_outofcore_handler (outofcore_handler, NULL);
|
||||
xgcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
|
||||
xgcry_control ((GCRYCTL_INITIALIZATION_FINISHED, 0));
|
||||
|
||||
/* Libgcrypt prints a warning when the first overflow is allocated;
|
||||
@@ -184,7 +185,8 @@ main (int argc, char **argv)
|
||||
@ -6,9 +6,9 @@ diff -up libgcrypt-1.8.4/random/rndlinux.c.use-poll libgcrypt-1.8.4/random/rndli
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
+#include <poll.h>
|
||||
#if defined(__linux__) && defined(HAVE_SYSCALL)
|
||||
# include <sys/syscall.h>
|
||||
#endif
|
||||
#if defined(__APPLE__) && defined(__MACH__)
|
||||
#include <Availability.h>
|
||||
#ifdef __MAC_10_11
|
||||
@@ -241,9 +242,8 @@ _gcry_rndlinux_gather_random (void (*add
|
||||
return with something we will actually use 100ms. */
|
||||
while (length)
|
||||
@ -18,8 +18,8 @@ diff -up libgcrypt-1.8.4/random/rndlinux.c.use-poll libgcrypt-1.8.4/random/rndli
|
||||
int rc;
|
||||
+ struct pollfd pfd;
|
||||
|
||||
/* If we have a modern Linux kernel, we first try to use the new
|
||||
* getrandom syscall. That call guarantees that the kernel's
|
||||
/* If we have a modern operating system, we first try to use the new
|
||||
* getentropy function. That call guarantees that the kernel's
|
||||
@@ -300,36 +300,25 @@ _gcry_rndlinux_gather_random (void (*add
|
||||
any_need_entropy = 1;
|
||||
}
|
||||
@ -23,7 +23,7 @@ diff -up libgcrypt-1.8.5/src/fips.c.fips-module libgcrypt-1.8.5/src/fips.c
|
||||
- actually used. The file itself may be empty. */
|
||||
- if ( !access (FIPS_FORCE_FILE, F_OK) )
|
||||
- {
|
||||
- gcry_assert (!no_fips_mode_required);
|
||||
- gcry_assert (!_gcry_no_fips_mode_required);
|
||||
- goto leave;
|
||||
- }
|
||||
-
|
||||
@ -42,7 +42,7 @@ diff -up libgcrypt-1.8.5/src/fips.c.fips-module libgcrypt-1.8.5/src/fips.c
|
||||
- {
|
||||
- /* System is in fips mode. */
|
||||
- fclose (fp);
|
||||
- gcry_assert (!no_fips_mode_required);
|
||||
- gcry_assert (!_gcry_no_fips_mode_required);
|
||||
- goto leave;
|
||||
- }
|
||||
- fclose (fp);
|
||||
@ -65,7 +65,7 @@ diff -up libgcrypt-1.8.5/src/fips.c.fips-module libgcrypt-1.8.5/src/fips.c
|
||||
- }
|
||||
-
|
||||
/* Fips not not requested, set flag. */
|
||||
no_fips_mode_required = 1;
|
||||
_gcry_no_fips_mode_required = 1;
|
||||
|
||||
diff -up libgcrypt-1.8.5/src/g10lib.h.fips-module libgcrypt-1.8.5/src/g10lib.h
|
||||
--- libgcrypt-1.8.5/src/g10lib.h.fips-module 2020-04-20 19:07:45.918919759 +0200
|
||||
@ -77,9 +77,9 @@ diff -up libgcrypt-1.8.5/src/g10lib.h.fips-module libgcrypt-1.8.5/src/g10lib.h
|
||||
+/* The name of the file used to force libgcrypt into fips mode. */
|
||||
+#define FIPS_FORCE_FILE "/etc/gcrypt/fips_enabled"
|
||||
+
|
||||
void _gcry_initialize_fips_mode (int force);
|
||||
extern int _gcry_no_fips_mode_required;
|
||||
|
||||
int _gcry_fips_mode (void);
|
||||
void _gcry_initialize_fips_mode (int force);
|
||||
diff -up libgcrypt-1.8.5/src/global.c.fips-module libgcrypt-1.8.5/src/global.c
|
||||
--- libgcrypt-1.8.5/src/global.c.fips-module 2020-04-20 19:07:45.919919741 +0200
|
||||
+++ libgcrypt-1.8.5/src/global.c 2020-04-20 19:07:45.950919149 +0200
|
||||
@ -154,13 +154,13 @@ diff -up libgcrypt-1.8.5/random/rndlinux.c.getrandom libgcrypt-1.8.5/random/rndl
|
||||
--- libgcrypt-1.8.5/random/rndlinux.c.getrandom 2020-04-20 15:01:50.159848963 +0200
|
||||
+++ libgcrypt-1.8.5/random/rndlinux.c 2020-04-20 16:14:21.901610921 +0200
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <poll.h>
|
||||
#if defined(__linux__) && defined(HAVE_SYSCALL)
|
||||
#if defined(__linux__) || !defined(HAVE_GETENTROPY)
|
||||
#ifdef HAVE_SYSCALL
|
||||
# include <sys/syscall.h>
|
||||
+# include <linux/random.h>
|
||||
# ifdef __NR_getrandom
|
||||
# define getentropy(buf,buflen) syscall (__NR_getrandom, buf, buflen, 0)
|
||||
# endif
|
||||
|
||||
#include "types.h"
|
||||
@@ -147,12 +148,12 @@ _gcry_rndlinux_gather_random (void (*add
|
||||
if (!add)
|
||||
{
|
||||
@ -216,25 +216,17 @@ diff -up libgcrypt-1.8.5/random/rndlinux.c.getrandom libgcrypt-1.8.5/random/rndl
|
||||
{
|
||||
if (fd_random == -1)
|
||||
{
|
||||
@@ -255,6 +272,7 @@ _gcry_rndlinux_gather_random (void (*add
|
||||
* syscall and not a new device and thus we are not able to use
|
||||
* select(2) to have a timeout. */
|
||||
#if defined(__linux__) && defined(HAVE_SYSCALL) && defined(__NR_getrandom)
|
||||
+ if (fd == -2)
|
||||
{
|
||||
long ret;
|
||||
size_t nbytes;
|
||||
@@ -270,9 +288,7 @@ _gcry_rndlinux_gather_random (void (*add
|
||||
_gcry_post_syscall ();
|
||||
}
|
||||
while (ret == -1 && errno == EINTR);
|
||||
- if (ret == -1 && errno == ENOSYS)
|
||||
- ; /* The syscall is not supported - fallback to pulling from fd. */
|
||||
- ; /* getentropy is not supported - fallback to pulling from fd. */
|
||||
- else
|
||||
+ if (1)
|
||||
{ /* The syscall is supported. Some sanity checks. */
|
||||
{ /* getentropy is supported. Some sanity checks. */
|
||||
if (ret == -1)
|
||||
log_fatal ("unexpected error from getrandom: %s\n",
|
||||
log_fatal ("unexpected error from getentropy: %s\n",
|
||||
diff -up libgcrypt-1.8.5/src/g10lib.h.getrandom libgcrypt-1.8.5/src/g10lib.h
|
||||
--- libgcrypt-1.8.5/src/g10lib.h.getrandom 2020-04-20 15:08:16.528538580 +0200
|
||||
+++ libgcrypt-1.8.5/src/g10lib.h 2020-04-20 15:08:28.641309399 +0200
|
||||
34
backport-libgcrypt-1.8.5-intel-cet.patch
Normal file
34
backport-libgcrypt-1.8.5-intel-cet.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From b04c0a86b19856071c29d2a6285f3240c606ee7a Mon Sep 17 00:00:00 2001
|
||||
From: "H.J. Lu" <hjl.tools@gmail.com>
|
||||
Date: Tue, 27 Apr 2021 09:08:41 -0700
|
||||
Subject: [PATCH] Always include <config.h> in cipher assembly codes
|
||||
|
||||
* cipher/poly1305-s390x.S: Always include <config.h>.
|
||||
|
||||
When Intel CET is enabled, we need to include <cet.h> in assembly codes
|
||||
to mark Intel CET support even if it is empty. We should always include
|
||||
<config.h> in cipher assembly codes so that they will be marked for
|
||||
Intel CET support when compiling for x86-64 and i686.
|
||||
|
||||
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
|
||||
---
|
||||
cipher/poly1305-s390x.S | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cipher/poly1305-s390x.S b/cipher/poly1305-s390x.S
|
||||
index 844245f6..28bed560 100644
|
||||
--- a/cipher/poly1305-s390x.S
|
||||
+++ b/cipher/poly1305-s390x.S
|
||||
@@ -18,8 +18,8 @@
|
||||
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
-#if defined (__s390x__) && __GNUC__ >= 4 && __ARCH__ >= 9
|
||||
#include <config.h>
|
||||
+#if defined (__s390x__) && __GNUC__ >= 4 && __ARCH__ >= 9
|
||||
#if defined(HAVE_GCC_INLINE_ASM_S390X)
|
||||
|
||||
#include "asm-poly1305-s390x.h"
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -75,15 +75,3 @@ diff -up libgcrypt-1.8.5/src/fips.c.use-fipscheck libgcrypt-1.8.5/src/fips.c
|
||||
p = strrchr (fname, '/');
|
||||
if (p)
|
||||
p++;
|
||||
diff -up libgcrypt-1.8.5/src/Makefile.am.use-fipscheck libgcrypt-1.8.5/src/Makefile.am
|
||||
--- libgcrypt-1.8.5/src/Makefile.am.use-fipscheck 2020-04-23 10:18:36.237764702 +0200
|
||||
+++ libgcrypt-1.8.5/src/Makefile.am 2020-04-23 10:19:03.186247455 +0200
|
||||
@@ -125,7 +125,7 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \
|
||||
../cipher/libcipher.la \
|
||||
../random/librandom.la \
|
||||
../mpi/libmpi.la \
|
||||
- ../compat/libcompat.la $(GPG_ERROR_LIBS)
|
||||
+ ../compat/libcompat.la $(GPG_ERROR_LIBS) -ldl
|
||||
|
||||
|
||||
dumpsexp_SOURCES = dumpsexp.c
|
||||
@ -1,35 +0,0 @@
|
||||
diff -up libgcrypt-1.7.3/src/visibility.c.fips-reqs libgcrypt-1.7.3/src/visibility.c
|
||||
--- libgcrypt-1.7.3/src/visibility.c.fips-reqs 2016-03-23 12:59:34.000000000 +0100
|
||||
+++ libgcrypt-1.7.3/src/visibility.c 2016-11-22 16:29:36.992042480 +0100
|
||||
@@ -1288,6 +1288,8 @@ gcry_kdf_derive (const void *passphrase,
|
||||
unsigned long iterations,
|
||||
size_t keysize, void *keybuffer)
|
||||
{
|
||||
+ if (!fips_is_operational ())
|
||||
+ return gpg_error (fips_not_operational ());
|
||||
return gpg_error (_gcry_kdf_derive (passphrase, passphraselen, algo, hashalgo,
|
||||
salt, saltlen, iterations,
|
||||
keysize, keybuffer));
|
||||
@@ -1343,6 +1345,13 @@ void
|
||||
gcry_mpi_randomize (gcry_mpi_t w,
|
||||
unsigned int nbits, enum gcry_random_level level)
|
||||
{
|
||||
+ if (!fips_is_operational ())
|
||||
+ {
|
||||
+ (void)fips_not_operational ();
|
||||
+ fips_signal_fatal_error ("called in non-operational state");
|
||||
+ fips_noreturn ();
|
||||
+ }
|
||||
+
|
||||
_gcry_mpi_randomize (w, nbits, level);
|
||||
}
|
||||
|
||||
@@ -1368,6 +1377,8 @@ gcry_prime_generate (gcry_mpi_t *prime,
|
||||
gcry_random_level_t random_level,
|
||||
unsigned int flags)
|
||||
{
|
||||
+ if (!fips_is_operational ())
|
||||
+ return gpg_error (fips_not_operational ());
|
||||
return gpg_error (_gcry_prime_generate (prime, prime_bits, factor_bits,
|
||||
factors, cb_func, cb_arg,
|
||||
random_level, flags));
|
||||
@ -1,322 +0,0 @@
|
||||
diff -up libgcrypt-1.8.3/cipher/cipher-cmac.c.cmac-selftest libgcrypt-1.8.3/cipher/cipher-cmac.c
|
||||
--- libgcrypt-1.8.3/cipher/cipher-cmac.c.cmac-selftest 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.3/cipher/cipher-cmac.c 2019-05-31 17:33:35.594407152 +0200
|
||||
@@ -251,3 +251,246 @@ _gcry_cipher_cmac_set_subkeys (gcry_ciph
|
||||
|
||||
return GPG_ERR_NO_ERROR;
|
||||
}
|
||||
+
|
||||
+/* CMAC selftests.
|
||||
+ * Copyright (C) 2008 Free Software Foundation, Inc.
|
||||
+ * Copyright (C) 2019 Red Hat, Inc.
|
||||
+ */
|
||||
+
|
||||
+
|
||||
+
|
||||
+/* Check one MAC with MAC ALGO using the regular MAC
|
||||
+ * API. (DATA,DATALEN) is the data to be MACed, (KEY,KEYLEN) the key
|
||||
+ * and (EXPECT,EXPECTLEN) the expected result. If TRUNC is set, the
|
||||
+ * EXPECTLEN may be less than the digest length. Returns NULL on
|
||||
+ * success or a string describing the failure. */
|
||||
+static const char *
|
||||
+check_one (int algo,
|
||||
+ const void *data, size_t datalen,
|
||||
+ const void *key, size_t keylen,
|
||||
+ const void *expect, size_t expectlen)
|
||||
+{
|
||||
+ gcry_mac_hd_t hd;
|
||||
+ unsigned char mac[512]; /* hardcoded to avoid allocation */
|
||||
+ size_t macoutlen = expectlen;
|
||||
+
|
||||
+/* printf ("MAC algo %d\n", algo); */
|
||||
+ if (_gcry_mac_get_algo_maclen (algo) != expectlen ||
|
||||
+ expectlen > sizeof (mac))
|
||||
+ return "invalid tests data";
|
||||
+ if (_gcry_mac_open (&hd, algo, 0, NULL))
|
||||
+ return "gcry_mac_open failed";
|
||||
+ if (_gcry_mac_setkey (hd, key, keylen))
|
||||
+ {
|
||||
+ _gcry_mac_close (hd);
|
||||
+ return "gcry_md_setkey failed";
|
||||
+ }
|
||||
+ if (_gcry_mac_write (hd, data, datalen))
|
||||
+ {
|
||||
+ _gcry_mac_close (hd);
|
||||
+ return "gcry_mac_write failed";
|
||||
+ }
|
||||
+ if (_gcry_mac_read (hd, mac, &macoutlen))
|
||||
+ {
|
||||
+ _gcry_mac_close (hd);
|
||||
+ return "gcry_mac_read failed";
|
||||
+ }
|
||||
+ _gcry_mac_close (hd);
|
||||
+ if (macoutlen != expectlen || memcmp (mac, expect, expectlen))
|
||||
+ {
|
||||
+/* int i; */
|
||||
+
|
||||
+/* fputs (" {", stdout); */
|
||||
+/* for (i=0; i < expectlen-1; i++) */
|
||||
+/* { */
|
||||
+/* if (i && !(i % 8)) */
|
||||
+/* fputs ("\n ", stdout); */
|
||||
+/* printf (" 0x%02x,", mac[i]); */
|
||||
+/* } */
|
||||
+/* printf (" 0x%02x } },\n", mac[i]); */
|
||||
+
|
||||
+ return "does not match";
|
||||
+ }
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static gpg_err_code_t
|
||||
+selftests_cmac_tdes (int extended, selftest_report_func_t report)
|
||||
+{
|
||||
+ const char *what;
|
||||
+ const char *errtxt;
|
||||
+
|
||||
+ what = "Basic TDES";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_3DES,
|
||||
+ "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
|
||||
+ "\xae\x2d\x8a\x57", 20,
|
||||
+ "\x8a\xa8\x3b\xf8\xcb\xda\x10\x62\x0b\xc1\xbf\x19\xfb\xb6\xcd\x58"
|
||||
+ "\xbc\x31\x3d\x4a\x37\x1c\xa8\xb5", 24,
|
||||
+ "\x74\x3d\xdb\xe0\xce\x2d\xc2\xed", 8);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ if (extended)
|
||||
+ {
|
||||
+ what = "Extended TDES #1";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_3DES,
|
||||
+ "", 0,
|
||||
+ "\x8a\xa8\x3b\xf8\xcb\xda\x10\x62\x0b\xc1\xbf\x19\xfb\xb6\xcd\x58"
|
||||
+ "\xbc\x31\x3d\x4a\x37\x1c\xa8\xb5", 24,
|
||||
+ "\xb7\xa6\x88\xe1\x22\xff\xaf\x95", 8);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ what = "Extended TDES #2";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_3DES,
|
||||
+ "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96", 8,
|
||||
+ "\x8a\xa8\x3b\xf8\xcb\xda\x10\x62\x0b\xc1\xbf\x19\xfb\xb6\xcd\x58"
|
||||
+ "\xbc\x31\x3d\x4a\x37\x1c\xa8\xb5", 24,
|
||||
+ "\x8e\x8f\x29\x31\x36\x28\x37\x97", 8);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ what = "Extended TDES #3";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_3DES,
|
||||
+ "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
|
||||
+ "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51", 32,
|
||||
+ "\x8a\xa8\x3b\xf8\xcb\xda\x10\x62\x0b\xc1\xbf\x19\xfb\xb6\xcd\x58"
|
||||
+ "\xbc\x31\x3d\x4a\x37\x1c\xa8\xb5", 24,
|
||||
+ "\x33\xe6\xb1\x09\x24\x00\xea\xe5", 8);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+ }
|
||||
+
|
||||
+ return 0; /* Succeeded. */
|
||||
+
|
||||
+ failed:
|
||||
+ if (report)
|
||||
+ report ("cmac", GCRY_MAC_CMAC_3DES, what, errtxt);
|
||||
+ return GPG_ERR_SELFTEST_FAILED;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
+static gpg_err_code_t
|
||||
+selftests_cmac_aes (int extended, selftest_report_func_t report)
|
||||
+{
|
||||
+ const char *what;
|
||||
+ const char *errtxt;
|
||||
+
|
||||
+ what = "Basic AES128";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_AES,
|
||||
+ "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
|
||||
+ "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
|
||||
+ "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11", 40,
|
||||
+ "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c", 16,
|
||||
+ "\xdf\xa6\x67\x47\xde\x9a\xe6\x30\x30\xca\x32\x61\x14\x97\xc8\x27", 16);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ what = "Basic AES192";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_AES,
|
||||
+ "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
|
||||
+ "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
|
||||
+ "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11", 40,
|
||||
+ "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b\x80\x90\x79\xe5"
|
||||
+ "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b", 24,
|
||||
+ "\x8a\x1d\xe5\xbe\x2e\xb3\x1a\xad\x08\x9a\x82\xe6\xee\x90\x8b\x0e", 16);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ what = "Basic AES256";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_AES,
|
||||
+ "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
|
||||
+ "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
|
||||
+ "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11", 40,
|
||||
+ "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81"
|
||||
+ "\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4", 32,
|
||||
+ "\xaa\xf3\xd8\xf1\xde\x56\x40\xc2\x32\xf5\xb1\x69\xb9\xc9\x11\xe6", 16);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+ if (extended)
|
||||
+ {
|
||||
+ what = "Extended AES #1";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_AES,
|
||||
+ "", 0,
|
||||
+ "\x2b\x7e\x15\x16\x28\xae\xd2\xa6\xab\xf7\x15\x88\x09\xcf\x4f\x3c", 16,
|
||||
+ "\xbb\x1d\x69\x29\xe9\x59\x37\x28\x7f\xa3\x7d\x12\x9b\x75\x67\x46", 16);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ what = "Extended AES #2";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_AES,
|
||||
+ "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a", 16,
|
||||
+ "\x8e\x73\xb0\xf7\xda\x0e\x64\x52\xc8\x10\xf3\x2b\x80\x90\x79\xe5"
|
||||
+ "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b", 24,
|
||||
+ "\x9e\x99\xa7\xbf\x31\xe7\x10\x90\x06\x62\xf6\x5e\x61\x7c\x51\x84", 16);
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+
|
||||
+ what = "Extended AES #3";
|
||||
+ errtxt = check_one (GCRY_MAC_CMAC_AES,
|
||||
+ "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
|
||||
+ "\xae\x2d\x8a\x57\x1e\x03\xac\x9c\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
|
||||
+ "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
|
||||
+ "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17\xad\x2b\x41\x7b\xe6\x6c\x37\x10", 64,
|
||||
+ "\x60\x3d\xeb\x10\x15\xca\x71\xbe\x2b\x73\xae\xf0\x85\x7d\x77\x81"
|
||||
+ "\x1f\x35\x2c\x07\x3b\x61\x08\xd7\x2d\x98\x10\xa3\x09\x14\xdf\xf4", 32,
|
||||
+ "\xe1\x99\x21\x90\x54\x9f\x6e\xd5\x69\x6a\x2c\x05\x6c\x31\x54\x10", 16 );
|
||||
+ if (errtxt)
|
||||
+ goto failed;
|
||||
+ }
|
||||
+
|
||||
+ return 0; /* Succeeded. */
|
||||
+
|
||||
+ failed:
|
||||
+ if (report)
|
||||
+ report ("cmac", GCRY_MAC_CMAC_AES, what, errtxt);
|
||||
+ return GPG_ERR_SELFTEST_FAILED;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/* Run a full self-test for ALGO and return 0 on success. */
|
||||
+static gpg_err_code_t
|
||||
+run_cmac_selftests (int algo, int extended, selftest_report_func_t report)
|
||||
+{
|
||||
+ gpg_err_code_t ec;
|
||||
+
|
||||
+ switch (algo)
|
||||
+ {
|
||||
+ case GCRY_MAC_CMAC_3DES:
|
||||
+ ec = selftests_cmac_tdes (extended, report);
|
||||
+ break;
|
||||
+ case GCRY_MAC_CMAC_AES:
|
||||
+ ec = selftests_cmac_aes (extended, report);
|
||||
+ break;
|
||||
+
|
||||
+ default:
|
||||
+ ec = GPG_ERR_MAC_ALGO;
|
||||
+ break;
|
||||
+ }
|
||||
+ return ec;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
+
|
||||
+/* Run the selftests for CMAC with CMAC algorithm ALGO with optional
|
||||
+ reporting function REPORT. */
|
||||
+gpg_error_t
|
||||
+_gcry_cmac_selftest (int algo, int extended, selftest_report_func_t report)
|
||||
+{
|
||||
+ gcry_err_code_t ec = 0;
|
||||
+
|
||||
+ if (!_gcry_mac_algo_info( algo, GCRYCTL_TEST_ALGO, NULL, NULL ))
|
||||
+ {
|
||||
+ ec = run_cmac_selftests (algo, extended, report);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ ec = GPG_ERR_MAC_ALGO;
|
||||
+ if (report)
|
||||
+ report ("mac", algo, "module", "algorithm not available");
|
||||
+ }
|
||||
+ return gpg_error (ec);
|
||||
+}
|
||||
diff -up libgcrypt-1.8.3/src/cipher-proto.h.cmac-selftest libgcrypt-1.8.3/src/cipher-proto.h
|
||||
--- libgcrypt-1.8.3/src/cipher-proto.h.cmac-selftest 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.3/src/cipher-proto.h 2019-05-31 17:29:34.574588234 +0200
|
||||
@@ -256,6 +256,8 @@ gcry_error_t _gcry_pk_selftest (int algo
|
||||
selftest_report_func_t report);
|
||||
gcry_error_t _gcry_hmac_selftest (int algo, int extended,
|
||||
selftest_report_func_t report);
|
||||
+gcry_error_t _gcry_cmac_selftest (int algo, int extended,
|
||||
+ selftest_report_func_t report);
|
||||
|
||||
gcry_error_t _gcry_random_selftest (selftest_report_func_t report);
|
||||
|
||||
diff -up libgcrypt-1.8.3/src/fips.c.cmac-selftest libgcrypt-1.8.3/src/fips.c
|
||||
--- libgcrypt-1.8.3/src/fips.c.cmac-selftest 2018-11-01 15:40:36.051865535 +0100
|
||||
+++ libgcrypt-1.8.3/src/fips.c 2019-05-31 17:31:20.157756640 +0200
|
||||
@@ -521,29 +521,32 @@ run_digest_selftests (int extended)
|
||||
|
||||
/* Run self-tests for all HMAC algorithms. Return 0 on success. */
|
||||
static int
|
||||
-run_hmac_selftests (int extended)
|
||||
+run_mac_selftests (int extended)
|
||||
{
|
||||
- static int algos[] =
|
||||
+ static int algos[][2] =
|
||||
{
|
||||
- GCRY_MD_SHA1,
|
||||
- GCRY_MD_SHA224,
|
||||
- GCRY_MD_SHA256,
|
||||
- GCRY_MD_SHA384,
|
||||
- GCRY_MD_SHA512,
|
||||
- GCRY_MD_SHA3_224,
|
||||
- GCRY_MD_SHA3_256,
|
||||
- GCRY_MD_SHA3_384,
|
||||
- GCRY_MD_SHA3_512,
|
||||
- 0
|
||||
+ { GCRY_MD_SHA1, 0 },
|
||||
+ { GCRY_MD_SHA224, 0 },
|
||||
+ { GCRY_MD_SHA256, 0 },
|
||||
+ { GCRY_MD_SHA384, 0 },
|
||||
+ { GCRY_MD_SHA512, 0 },
|
||||
+ { GCRY_MD_SHA3_224, 0 },
|
||||
+ { GCRY_MD_SHA3_256, 0 },
|
||||
+ { GCRY_MD_SHA3_384, 0 },
|
||||
+ { GCRY_MD_SHA3_512, 0 },
|
||||
+ { GCRY_MAC_CMAC_3DES, 1 },
|
||||
+ { GCRY_MAC_CMAC_AES, 1 },
|
||||
+ { 0, 0 }
|
||||
};
|
||||
int idx;
|
||||
gpg_error_t err;
|
||||
int anyerr = 0;
|
||||
|
||||
- for (idx=0; algos[idx]; idx++)
|
||||
+ for (idx=0; algos[idx][0]; idx++)
|
||||
{
|
||||
- err = _gcry_hmac_selftest (algos[idx], extended, reporter);
|
||||
- reporter ("hmac", algos[idx], NULL,
|
||||
+ err = algos[idx][1] ? _gcry_cmac_selftest (algos[idx][0], extended, reporter) :
|
||||
+ _gcry_hmac_selftest (algos[idx][0], extended, reporter);
|
||||
+ reporter (algos[idx][1] ? "cmac" : "hmac", algos[idx][0], NULL,
|
||||
err? gpg_strerror (err):NULL);
|
||||
if (err)
|
||||
anyerr = 1;
|
||||
@@ -747,7 +750,7 @@ _gcry_fips_run_selftests (int extended)
|
||||
if (run_digest_selftests (extended))
|
||||
goto leave;
|
||||
|
||||
- if (run_hmac_selftests (extended))
|
||||
+ if (run_mac_selftests (extended))
|
||||
goto leave;
|
||||
|
||||
/* Run random tests before the pubkey tests because the latter
|
||||
@ -1,18 +0,0 @@
|
||||
diff -up libgcrypt-1.8.3/cipher/md.c.fips-enforce libgcrypt-1.8.3/cipher/md.c
|
||||
--- libgcrypt-1.8.3/cipher/md.c.fips-enforce 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.3/cipher/md.c 2020-04-17 15:07:31.364945130 +0200
|
||||
@@ -409,13 +409,10 @@ md_enable (gcry_md_hd_t hd, int algorith
|
||||
}
|
||||
|
||||
|
||||
- if (!err && algorithm == GCRY_MD_MD5 && fips_mode ())
|
||||
+ if (!err && !spec->flags.fips && fips_mode ())
|
||||
{
|
||||
- _gcry_inactivate_fips_mode ("MD5 used");
|
||||
if (_gcry_enforced_fips_mode () )
|
||||
{
|
||||
- /* We should never get to here because we do not register
|
||||
- MD5 in enforced fips mode. But better throw an error. */
|
||||
err = GPG_ERR_DIGEST_ALGO;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,348 +0,0 @@
|
||||
diff -up libgcrypt-1.8.5/cipher/camellia-aesni-avx2-amd64.S.intel-cet libgcrypt-1.8.5/cipher/camellia-aesni-avx2-amd64.S
|
||||
--- libgcrypt-1.8.5/cipher/camellia-aesni-avx2-amd64.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/cipher/camellia-aesni-avx2-amd64.S 2020-01-23 15:36:44.148972045 +0100
|
||||
@@ -18,8 +18,9 @@
|
||||
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
-#ifdef __x86_64
|
||||
#include <config.h>
|
||||
+
|
||||
+#ifdef __x86_64
|
||||
#if (defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) || \
|
||||
defined(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS)) && \
|
||||
defined(ENABLE_AESNI_SUPPORT) && defined(ENABLE_AVX2_SUPPORT)
|
||||
diff -up libgcrypt-1.8.5/cipher/camellia-aesni-avx-amd64.S.intel-cet libgcrypt-1.8.5/cipher/camellia-aesni-avx-amd64.S
|
||||
--- libgcrypt-1.8.5/cipher/camellia-aesni-avx-amd64.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/cipher/camellia-aesni-avx-amd64.S 2020-01-23 15:36:44.145972088 +0100
|
||||
@@ -18,8 +18,9 @@
|
||||
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
-#ifdef __x86_64
|
||||
#include <config.h>
|
||||
+
|
||||
+#ifdef __x86_64
|
||||
#if (defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) || \
|
||||
defined(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS)) && \
|
||||
defined(ENABLE_AESNI_SUPPORT) && defined(ENABLE_AVX_SUPPORT)
|
||||
diff -up libgcrypt-1.8.5/cipher/chacha20-avx2-amd64.S.intel-cet libgcrypt-1.8.5/cipher/chacha20-avx2-amd64.S
|
||||
--- libgcrypt-1.8.5/cipher/chacha20-avx2-amd64.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/cipher/chacha20-avx2-amd64.S 2020-01-23 15:36:16.780250066 +0100
|
||||
@@ -48,6 +48,9 @@
|
||||
.globl _gcry_chacha20_amd64_avx2_blocks
|
||||
ELF(.type _gcry_chacha20_amd64_avx2_blocks,@function;)
|
||||
_gcry_chacha20_amd64_avx2_blocks:
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
.Lchacha_blocks_avx2_local:
|
||||
vzeroupper
|
||||
pushq %rbx
|
||||
diff -up libgcrypt-1.8.5/cipher/chacha20-sse2-amd64.S.intel-cet libgcrypt-1.8.5/cipher/chacha20-sse2-amd64.S
|
||||
--- libgcrypt-1.8.5/cipher/chacha20-sse2-amd64.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/cipher/chacha20-sse2-amd64.S 2020-01-23 15:36:16.783250095 +0100
|
||||
@@ -41,6 +41,9 @@
|
||||
.globl _gcry_chacha20_amd64_sse2_blocks
|
||||
ELF(.type _gcry_chacha20_amd64_sse2_blocks,@function;)
|
||||
_gcry_chacha20_amd64_sse2_blocks:
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
.Lchacha_blocks_sse2_local:
|
||||
pushq %rbx
|
||||
pushq %rbp
|
||||
diff -up libgcrypt-1.8.5/cipher/poly1305-avx2-amd64.S.intel-cet libgcrypt-1.8.5/cipher/poly1305-avx2-amd64.S
|
||||
--- libgcrypt-1.8.5/cipher/poly1305-avx2-amd64.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/cipher/poly1305-avx2-amd64.S 2020-01-23 15:36:16.784250105 +0100
|
||||
@@ -43,6 +43,9 @@
|
||||
.globl _gcry_poly1305_amd64_avx2_init_ext
|
||||
ELF(.type _gcry_poly1305_amd64_avx2_init_ext,@function;)
|
||||
_gcry_poly1305_amd64_avx2_init_ext:
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
.Lpoly1305_init_ext_avx2_local:
|
||||
xor %edx, %edx
|
||||
vzeroupper
|
||||
@@ -406,6 +409,9 @@ ELF(.size _gcry_poly1305_amd64_avx2_init
|
||||
.globl _gcry_poly1305_amd64_avx2_blocks
|
||||
ELF(.type _gcry_poly1305_amd64_avx2_blocks,@function;)
|
||||
_gcry_poly1305_amd64_avx2_blocks:
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
.Lpoly1305_blocks_avx2_local:
|
||||
vzeroupper
|
||||
pushq %rbp
|
||||
@@ -732,6 +738,9 @@ ELF(.size _gcry_poly1305_amd64_avx2_bloc
|
||||
.globl _gcry_poly1305_amd64_avx2_finish_ext
|
||||
ELF(.type _gcry_poly1305_amd64_avx2_finish_ext,@function;)
|
||||
_gcry_poly1305_amd64_avx2_finish_ext:
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
.Lpoly1305_finish_ext_avx2_local:
|
||||
vzeroupper
|
||||
pushq %rbp
|
||||
diff -up libgcrypt-1.8.5/cipher/poly1305-sse2-amd64.S.intel-cet libgcrypt-1.8.5/cipher/poly1305-sse2-amd64.S
|
||||
--- libgcrypt-1.8.5/cipher/poly1305-sse2-amd64.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/cipher/poly1305-sse2-amd64.S 2020-01-23 15:36:16.787250134 +0100
|
||||
@@ -42,6 +42,9 @@
|
||||
.globl _gcry_poly1305_amd64_sse2_init_ext
|
||||
ELF(.type _gcry_poly1305_amd64_sse2_init_ext,@function;)
|
||||
_gcry_poly1305_amd64_sse2_init_ext:
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
.Lpoly1305_init_ext_x86_local:
|
||||
xor %edx, %edx
|
||||
pushq %r12
|
||||
@@ -288,6 +291,9 @@ ELF(.size _gcry_poly1305_amd64_sse2_init
|
||||
.globl _gcry_poly1305_amd64_sse2_finish_ext
|
||||
ELF(.type _gcry_poly1305_amd64_sse2_finish_ext,@function;)
|
||||
_gcry_poly1305_amd64_sse2_finish_ext:
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
.Lpoly1305_finish_ext_x86_local:
|
||||
pushq %rbp
|
||||
movq %rsp, %rbp
|
||||
@@ -439,6 +445,9 @@ ELF(.size _gcry_poly1305_amd64_sse2_fini
|
||||
.globl _gcry_poly1305_amd64_sse2_blocks
|
||||
ELF(.type _gcry_poly1305_amd64_sse2_blocks,@function;)
|
||||
_gcry_poly1305_amd64_sse2_blocks:
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
.Lpoly1305_blocks_x86_local:
|
||||
pushq %rbp
|
||||
movq %rsp, %rbp
|
||||
diff -up libgcrypt-1.8.5/cipher/serpent-avx2-amd64.S.intel-cet libgcrypt-1.8.5/cipher/serpent-avx2-amd64.S
|
||||
--- libgcrypt-1.8.5/cipher/serpent-avx2-amd64.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/cipher/serpent-avx2-amd64.S 2020-01-23 15:36:44.151972003 +0100
|
||||
@@ -18,8 +18,9 @@
|
||||
* License along with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
-#ifdef __x86_64
|
||||
#include <config.h>
|
||||
+
|
||||
+#ifdef __x86_64
|
||||
#if (defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) || \
|
||||
defined(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS)) && defined(USE_SERPENT) && \
|
||||
defined(ENABLE_AVX2_SUPPORT)
|
||||
diff -up libgcrypt-1.8.5/configure.ac.intel-cet libgcrypt-1.8.5/configure.ac
|
||||
--- libgcrypt-1.8.5/configure.ac.intel-cet 2019-08-29 15:00:08.000000000 +0200
|
||||
+++ libgcrypt-1.8.5/configure.ac 2020-01-23 15:35:28.147774463 +0100
|
||||
@@ -95,6 +95,12 @@ AH_TOP([
|
||||
AH_BOTTOM([
|
||||
#define _GCRYPT_IN_LIBGCRYPT 1
|
||||
|
||||
+/* Add .note.gnu.property section for Intel CET in assembler sources
|
||||
+ when CET is enabled. */
|
||||
+#if defined(__ASSEMBLER__) && defined(__CET__)
|
||||
+# include <cet.h>
|
||||
+#endif
|
||||
+
|
||||
/* If the configure check for endianness has been disabled, get it from
|
||||
OS macros. This is intended for making fat binary builds on OS X. */
|
||||
#ifdef DISABLED_ENDIAN_CHECK
|
||||
diff -up libgcrypt-1.8.5/mpi/config.links.intel-cet libgcrypt-1.8.5/mpi/config.links
|
||||
--- libgcrypt-1.8.5/mpi/config.links.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/mpi/config.links 2020-01-23 15:35:46.398952954 +0100
|
||||
@@ -382,6 +382,16 @@ if test x"$mpi_cpu_arch" = x ; then
|
||||
mpi_cpu_arch="unknown"
|
||||
fi
|
||||
|
||||
+# Add .note.gnu.property section for Intel CET in assembler sources
|
||||
+# when CET is enabled. */
|
||||
+if test x"$mpi_cpu_arch" = xx86 ; then
|
||||
+ cat <<EOF >> ./mpi/asm-syntax.h
|
||||
+
|
||||
+#if defined(__ASSEMBLER__) && defined(__CET__)
|
||||
+# include <cet.h>
|
||||
+#endif
|
||||
+EOF
|
||||
+fi
|
||||
|
||||
# Make sysdep.h
|
||||
echo '/* created by config.links - do not edit */' >./mpi/sysdep.h
|
||||
diff -up libgcrypt-1.8.5/mpi/i386/mpih-add1.S.intel-cet libgcrypt-1.8.5/mpi/i386/mpih-add1.S
|
||||
--- libgcrypt-1.8.5/mpi/i386/mpih-add1.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/mpi/i386/mpih-add1.S 2020-01-23 15:37:40.470175379 +0100
|
||||
@@ -52,6 +52,10 @@ C_SYMBOL_NAME(_gcry_mpih_add_n:)
|
||||
movl 20(%esp),%edx /* s2_ptr */
|
||||
movl 24(%esp),%ecx /* size */
|
||||
|
||||
+#if defined __CET__ && (__CET__ & 1) != 0
|
||||
+ pushl %ebx
|
||||
+#endif
|
||||
+
|
||||
movl %ecx,%eax
|
||||
shrl $3,%ecx /* compute count for unrolled loop */
|
||||
negl %eax
|
||||
@@ -63,6 +67,9 @@ C_SYMBOL_NAME(_gcry_mpih_add_n:)
|
||||
subl %eax,%esi /* ... by a constant when we ... */
|
||||
subl %eax,%edx /* ... enter the loop */
|
||||
shrl $2,%eax /* restore previous value */
|
||||
+#if defined __CET__ && (__CET__ & 1) != 0
|
||||
+ leal -4(,%eax,4),%ebx /* Count for 4-byte endbr32 */
|
||||
+#endif
|
||||
#ifdef PIC
|
||||
/* Calculate start address in loop for PIC. Due to limitations in some
|
||||
assemblers, Loop-L0-3 cannot be put into the leal */
|
||||
@@ -75,29 +82,53 @@ L0: leal (%eax,%eax,8),%eax
|
||||
/* Calculate start address in loop for non-PIC. */
|
||||
leal (Loop - 3)(%eax,%eax,8),%eax
|
||||
#endif
|
||||
+#if defined __CET__ && (__CET__ & 1) != 0
|
||||
+ addl %ebx,%eax /* Adjust for endbr32 */
|
||||
+#endif
|
||||
jmp *%eax /* jump into loop */
|
||||
ALIGN (3)
|
||||
Loop: movl (%esi),%eax
|
||||
adcl (%edx),%eax
|
||||
movl %eax,(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 4(%esi),%eax
|
||||
adcl 4(%edx),%eax
|
||||
movl %eax,4(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 8(%esi),%eax
|
||||
adcl 8(%edx),%eax
|
||||
movl %eax,8(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 12(%esi),%eax
|
||||
adcl 12(%edx),%eax
|
||||
movl %eax,12(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 16(%esi),%eax
|
||||
adcl 16(%edx),%eax
|
||||
movl %eax,16(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 20(%esi),%eax
|
||||
adcl 20(%edx),%eax
|
||||
movl %eax,20(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 24(%esi),%eax
|
||||
adcl 24(%edx),%eax
|
||||
movl %eax,24(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 28(%esi),%eax
|
||||
adcl 28(%edx),%eax
|
||||
movl %eax,28(%edi)
|
||||
@@ -110,6 +141,10 @@ Loop: movl (%esi),%eax
|
||||
sbbl %eax,%eax
|
||||
negl %eax
|
||||
|
||||
+#if defined __CET__ && (__CET__ & 1) != 0
|
||||
+ popl %ebx
|
||||
+#endif
|
||||
+
|
||||
popl %esi
|
||||
popl %edi
|
||||
ret
|
||||
diff -up libgcrypt-1.8.5/mpi/i386/mpih-sub1.S.intel-cet libgcrypt-1.8.5/mpi/i386/mpih-sub1.S
|
||||
--- libgcrypt-1.8.5/mpi/i386/mpih-sub1.S.intel-cet 2017-11-23 19:16:58.000000000 +0100
|
||||
+++ libgcrypt-1.8.5/mpi/i386/mpih-sub1.S 2020-01-23 15:37:40.472175351 +0100
|
||||
@@ -53,6 +53,10 @@ C_SYMBOL_NAME(_gcry_mpih_sub_n:)
|
||||
movl 20(%esp),%edx /* s2_ptr */
|
||||
movl 24(%esp),%ecx /* size */
|
||||
|
||||
+#if defined __CET__ && (__CET__ & 1) != 0
|
||||
+ pushl %ebx
|
||||
+#endif
|
||||
+
|
||||
movl %ecx,%eax
|
||||
shrl $3,%ecx /* compute count for unrolled loop */
|
||||
negl %eax
|
||||
@@ -64,6 +68,9 @@ C_SYMBOL_NAME(_gcry_mpih_sub_n:)
|
||||
subl %eax,%esi /* ... by a constant when we ... */
|
||||
subl %eax,%edx /* ... enter the loop */
|
||||
shrl $2,%eax /* restore previous value */
|
||||
+#if defined __CET__ && (__CET__ & 1) != 0
|
||||
+ leal -4(,%eax,4),%ebx /* Count for 4-byte endbr32 */
|
||||
+#endif
|
||||
#ifdef PIC
|
||||
/* Calculate start address in loop for PIC. Due to limitations in some
|
||||
assemblers, Loop-L0-3 cannot be put into the leal */
|
||||
@@ -76,29 +83,53 @@ L0: leal (%eax,%eax,8),%eax
|
||||
/* Calculate start address in loop for non-PIC. */
|
||||
leal (Loop - 3)(%eax,%eax,8),%eax
|
||||
#endif
|
||||
+#if defined __CET__ && (__CET__ & 1) != 0
|
||||
+ addl %ebx,%eax /* Adjust for endbr32 */
|
||||
+#endif
|
||||
jmp *%eax /* jump into loop */
|
||||
ALIGN (3)
|
||||
Loop: movl (%esi),%eax
|
||||
sbbl (%edx),%eax
|
||||
movl %eax,(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 4(%esi),%eax
|
||||
sbbl 4(%edx),%eax
|
||||
movl %eax,4(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 8(%esi),%eax
|
||||
sbbl 8(%edx),%eax
|
||||
movl %eax,8(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 12(%esi),%eax
|
||||
sbbl 12(%edx),%eax
|
||||
movl %eax,12(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 16(%esi),%eax
|
||||
sbbl 16(%edx),%eax
|
||||
movl %eax,16(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 20(%esi),%eax
|
||||
sbbl 20(%edx),%eax
|
||||
movl %eax,20(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 24(%esi),%eax
|
||||
sbbl 24(%edx),%eax
|
||||
movl %eax,24(%edi)
|
||||
+#ifdef _CET_ENDBR
|
||||
+ _CET_ENDBR
|
||||
+#endif
|
||||
movl 28(%esi),%eax
|
||||
sbbl 28(%edx),%eax
|
||||
movl %eax,28(%edi)
|
||||
@@ -111,6 +142,10 @@ Loop: movl (%esi),%eax
|
||||
sbbl %eax,%eax
|
||||
negl %eax
|
||||
|
||||
+#if defined __CET__ && (__CET__ & 1) != 0
|
||||
+ popl %ebx
|
||||
+#endif
|
||||
+
|
||||
popl %esi
|
||||
popl %edi
|
||||
ret
|
||||
Binary file not shown.
BIN
libgcrypt-1.9.4.tar.bz2
Normal file
BIN
libgcrypt-1.9.4.tar.bz2
Normal file
Binary file not shown.
@ -3,36 +3,27 @@
|
||||
%global hmackey orboDeJITITejsirpADONivirpUkvarP
|
||||
|
||||
Name: libgcrypt
|
||||
Version: 1.8.7
|
||||
Release: 5
|
||||
Version: 1.9.4
|
||||
Release: 1
|
||||
Summary: A general-purpose cryptography library
|
||||
License: LGPLv2+
|
||||
URL: https://www.gnupg.org/
|
||||
Source0: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
|
||||
Source7: random.conf
|
||||
|
||||
Patch0: libgcrypt-1.8.5-use-fipscheck.patch
|
||||
Patch1: libgcrypt-1.8.4-fips-keygen.patch
|
||||
Patch2: libgcrypt-1.8.4-tests-fipsmode.patch
|
||||
Patch3: libgcrypt-1.7.3-fips-cavs.patch
|
||||
Patch4: libgcrypt-1.8.4-use-poll.patch
|
||||
Patch5: libgcrypt-1.6.1-mpicoder-gccopt.patch
|
||||
Patch6: libgcrypt-1.7.3-ecc-test-fix.patch
|
||||
Patch7: libgcrypt-1.8.3-fips-ctor.patch
|
||||
Patch8: libgcrypt-1.7.3-fips-reqs.patch
|
||||
Patch9: libgcrypt-1.8.5-getrandom.patch
|
||||
Patch10: libgcrypt-1.8.3-cmac-selftest.patch
|
||||
Patch11: libgcrypt-1.8.3-fips-enttest.patch
|
||||
Patch12: libgcrypt-1.8.3-md-fips-enforce.patch
|
||||
Patch13: libgcrypt-1.8.5-intel-cet.patch
|
||||
Patch14: libgcrypt-1.8.5-fips-module.patch
|
||||
Patch15: libgcrypt-1.8.5-aes-perf.patch
|
||||
Patch16: CVE-2019-12904-1.patch
|
||||
Patch17: CVE-2019-12904-2.patch
|
||||
Patch18: CVE-2019-12904-3.patch
|
||||
Patch19: CVE-2021-33560.patch
|
||||
Patch20: CVE-2021-40528.patch
|
||||
Patch21: backport-add-crypto-hash-sm3.patch
|
||||
Patch0: backport-libgcrypt-1.8.5-use-fipscheck.patch
|
||||
Patch1: backport-libgcrypt-1.8.4-fips-keygen.patch
|
||||
Patch2: backport-libgcrypt-1.8.4-tests-fipsmode.patch
|
||||
Patch3: backport-libgcrypt-1.7.3-fips-cavs.patch
|
||||
Patch4: backport-libgcrypt-1.8.4-use-poll.patch
|
||||
Patch5: backport-libgcrypt-1.6.1-mpicoder-gccopt.patch
|
||||
Patch6: backport-libgcrypt-1.7.3-ecc-test-fix.patch
|
||||
Patch7: backport-libgcrypt-1.8.3-fips-ctor.patch
|
||||
Patch8: backport-libgcrypt-1.8.5-getrandom.patch
|
||||
Patch9: backport-libgcrypt-1.8.3-fips-enttest.patch
|
||||
Patch10: backport-libgcrypt-1.8.3-md-fips-enforce.patch
|
||||
Patch11: backport-libgcrypt-1.8.5-intel-cet.patch
|
||||
Patch12: backport-libgcrypt-1.8.5-fips-module.patch
|
||||
|
||||
BuildRequires: gcc texinfo autoconf automake libtool
|
||||
BuildRequires: gawk libgpg-error-devel >= 1.11 pkgconfig
|
||||
@ -140,6 +131,12 @@ install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/gcrypt/random.conf
|
||||
%{_infodir}/gcrypt.info*
|
||||
|
||||
%changelog
|
||||
* Thu Dec 30 2021 zoulin <zoulin13@huawei.com> - 1.9.4-1
|
||||
- Type:requirements
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:Update version to 1.9.4
|
||||
|
||||
* Wed Oct 27 2021 zhujianwei001 <zhujianwei7@huawei.com> - 1.8.7-5
|
||||
- Type:requirements
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user