1. add libgcrypt
This commit is contained in:
parent
a17dbfd0c9
commit
e04ee3cc09
|
|
@ -0,0 +1,183 @@
|
||||||
|
From 72b9e9040d58c15f0302bd8abda28179f04e1c5f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||||
|
Date: Wed, 16 Aug 2017 10:43:18 +0800
|
||||||
|
Subject: [PATCH 1/4] Add and use pkg-config for libgcrypt instead of -config
|
||||||
|
scripts.
|
||||||
|
|
||||||
|
Upstream-Status: Denied [upstream have indicated they don't want a
|
||||||
|
pkg-config dependency]
|
||||||
|
|
||||||
|
RP 2014/5/22
|
||||||
|
|
||||||
|
Rebase to 1.8.0
|
||||||
|
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
configure.ac | 1 +
|
||||||
|
src/libgcrypt.m4 | 71 +++--------------------------------------------------
|
||||||
|
src/libgcrypt.pc.in | 33 +++++++++++++++++++++++++
|
||||||
|
3 files changed, 38 insertions(+), 67 deletions(-)
|
||||||
|
create mode 100644 src/libgcrypt.pc.in
|
||||||
|
|
||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index bbe8104..3d2de73 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -2607,6 +2607,7 @@ random/Makefile
|
||||||
|
doc/Makefile
|
||||||
|
src/Makefile
|
||||||
|
src/gcrypt.h
|
||||||
|
+src/libgcrypt.pc
|
||||||
|
src/libgcrypt-config
|
||||||
|
src/versioninfo.rc
|
||||||
|
tests/Makefile
|
||||||
|
diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
|
||||||
|
index c67cfec..4ea5f2c 100644
|
||||||
|
--- a/src/libgcrypt.m4
|
||||||
|
+++ b/src/libgcrypt.m4
|
||||||
|
@@ -29,30 +29,6 @@ dnl is added to the gpg_config_script_warn variable.
|
||||||
|
dnl
|
||||||
|
AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||||
|
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
- AC_ARG_WITH(libgcrypt-prefix,
|
||||||
|
- AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
|
||||||
|
- [prefix where LIBGCRYPT is installed (optional)]),
|
||||||
|
- libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
|
||||||
|
- if test x"${LIBGCRYPT_CONFIG}" = x ; then
|
||||||
|
- if test x"${libgcrypt_config_prefix}" != x ; then
|
||||||
|
- LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config"
|
||||||
|
- else
|
||||||
|
- case "${SYSROOT}" in
|
||||||
|
- /*)
|
||||||
|
- if test -x "${SYSROOT}/bin/libgcrypt-config" ; then
|
||||||
|
- LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config"
|
||||||
|
- fi
|
||||||
|
- ;;
|
||||||
|
- '')
|
||||||
|
- ;;
|
||||||
|
- *)
|
||||||
|
- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
|
||||||
|
- ;;
|
||||||
|
- esac
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
|
||||||
|
tmp=ifelse([$1], ,1:1.2.0,$1)
|
||||||
|
if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
|
||||||
|
req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
|
||||||
|
@@ -62,48 +38,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||||
|
min_libgcrypt_version="$tmp"
|
||||||
|
fi
|
||||||
|
|
||||||
|
- AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
|
||||||
|
- ok=no
|
||||||
|
- if test "$LIBGCRYPT_CONFIG" != "no" ; then
|
||||||
|
- req_major=`echo $min_libgcrypt_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||||
|
- req_minor=`echo $min_libgcrypt_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||||
|
- req_micro=`echo $min_libgcrypt_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||||
|
- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
|
||||||
|
- major=`echo $libgcrypt_config_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||||
|
- minor=`echo $libgcrypt_config_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
||||||
|
- micro=`echo $libgcrypt_config_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
||||||
|
- if test "$major" -gt "$req_major"; then
|
||||||
|
- ok=yes
|
||||||
|
- else
|
||||||
|
- if test "$major" -eq "$req_major"; then
|
||||||
|
- if test "$minor" -gt "$req_minor"; then
|
||||||
|
- ok=yes
|
||||||
|
- else
|
||||||
|
- if test "$minor" -eq "$req_minor"; then
|
||||||
|
- if test "$micro" -ge "$req_micro"; then
|
||||||
|
- ok=yes
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- if test $ok = yes; then
|
||||||
|
- AC_MSG_RESULT([yes ($libgcrypt_config_version)])
|
||||||
|
- else
|
||||||
|
- AC_MSG_RESULT(no)
|
||||||
|
- fi
|
||||||
|
+ PKG_CHECK_MODULES(LIBGCRYPT, [libgcrypt >= $min_libgcrypt_version], [ok=yes], [ok=no])
|
||||||
|
+
|
||||||
|
if test $ok = yes; then
|
||||||
|
# If we have a recent libgcrypt, we should also check that the
|
||||||
|
# API is compatible
|
||||||
|
if test "$req_libgcrypt_api" -gt 0 ; then
|
||||||
|
- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
|
||||||
|
+ tmp=`$PKG_CONFIG --variable=api_version libgcrypt`
|
||||||
|
if test "$tmp" -gt 0 ; then
|
||||||
|
AC_MSG_CHECKING([LIBGCRYPT API version])
|
||||||
|
if test "$req_libgcrypt_api" -eq "$tmp" ; then
|
||||||
|
@@ -116,10 +57,8 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test $ok = yes; then
|
||||||
|
- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
|
||||||
|
- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
|
||||||
|
ifelse([$2], , :, [$2])
|
||||||
|
- libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
|
||||||
|
+ libgcrypt_config_host=`$PKG_CONFIG --variable=host libgcrypt`
|
||||||
|
if test x"$libgcrypt_config_host" != xnone ; then
|
||||||
|
if test x"$libgcrypt_config_host" != x"$host" ; then
|
||||||
|
AC_MSG_WARN([[
|
||||||
|
@@ -134,8 +73,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
- LIBGCRYPT_CFLAGS=""
|
||||||
|
- LIBGCRYPT_LIBS=""
|
||||||
|
ifelse([$3], , :, [$3])
|
||||||
|
fi
|
||||||
|
AC_SUBST(LIBGCRYPT_CFLAGS)
|
||||||
|
diff --git a/src/libgcrypt.pc.in b/src/libgcrypt.pc.in
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..2fc8f53
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/src/libgcrypt.pc.in
|
||||||
|
@@ -0,0 +1,33 @@
|
||||||
|
+# Process this file with autoconf to produce a pkg-config metadata file.
|
||||||
|
+# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation
|
||||||
|
+# Author: Simon Josefsson
|
||||||
|
+#
|
||||||
|
+# This file is free software; as a special exception the author gives
|
||||||
|
+# unlimited permission to copy and/or distribute it, with or without
|
||||||
|
+# modifications, as long as this notice is preserved.
|
||||||
|
+#
|
||||||
|
+# This file is distributed in the hope that it will be useful, but
|
||||||
|
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
|
||||||
|
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
+
|
||||||
|
+prefix=@prefix@
|
||||||
|
+exec_prefix=@exec_prefix@
|
||||||
|
+libdir=@libdir@
|
||||||
|
+includedir=@includedir@
|
||||||
|
+
|
||||||
|
+# API info
|
||||||
|
+api_version=@LIBGCRYPT_CONFIG_API_VERSION@
|
||||||
|
+host=@LIBGCRYPT_CONFIG_HOST@
|
||||||
|
+
|
||||||
|
+# Misc information.
|
||||||
|
+symmetric_ciphers=@LIBGCRYPT_CIPHERS@
|
||||||
|
+asymmetric_ciphers=@LIBGCRYPT_PUBKEY_CIPHERS@
|
||||||
|
+digests=@LIBGCRYPT_DIGESTS@
|
||||||
|
+
|
||||||
|
+Name: libgcrypt
|
||||||
|
+Description: GNU crypto library
|
||||||
|
+URL: http://www.gnupg.org
|
||||||
|
+Version: @VERSION@
|
||||||
|
+Libs: -L${libdir} -lgcrypt
|
||||||
|
+Libs.private: -L${libdir} -lgpg-error
|
||||||
|
+Cflags: -I${includedir}
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,90 @@
|
||||||
|
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 1/3] 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>
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
[https://github.com/gpg/libgcrypt/commit/1374254c2904ab5b18ba4a890856824a102d4705]
|
||||||
|
|
||||||
|
CVE: CVE-2019-12904
|
||||||
|
|
||||||
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||||
|
---
|
||||||
|
cipher/cipher-gcm.c | 33 +++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 33 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/cipher/cipher-gcm.c b/cipher/cipher-gcm.c
|
||||||
|
index c19f09f..11f119a 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.7.4
|
||||||
|
|
||||||
|
|
@ -0,0 +1,332 @@
|
||||||
|
From 119348dd9aa52ab229afb5e2d3342d2b76fe81bf 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 2/3] 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>
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
[https://github.com/gpg/libgcrypt/commit/daedbbb5541cd8ecda1459d3b843ea4d92788762]
|
||||||
|
|
||||||
|
CVE: CVE-2019-12904
|
||||||
|
|
||||||
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||||
|
---
|
||||||
|
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*/
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
From 97570ef271ea1fb7b5ca903eec88f68407b0ec76 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Chen Qi <Qi.Chen@windriver.com>
|
||||||
|
Date: Wed, 16 Aug 2017 10:44:41 +0800
|
||||||
|
Subject: [PATCH 2/4] libgcrypt: fix building error with '-O2' in sysroot path
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Characters like '-O2' or '-Ofast' will be replaced by '-O1' when
|
||||||
|
compiling cipher.
|
||||||
|
If we are cross compiling libgcrypt and sysroot contains such
|
||||||
|
characters, we would
|
||||||
|
get compile errors because the sysroot path has been modified.
|
||||||
|
|
||||||
|
Fix this by adding blank spaces before and after the original matching
|
||||||
|
pattern in the
|
||||||
|
sed command.
|
||||||
|
|
||||||
|
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||||
|
|
||||||
|
Rebase to 1.8.0
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
cipher/Makefile.am | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
|
||||||
|
index 95c4510..bd52ec7 100644
|
||||||
|
--- a/cipher/Makefile.am
|
||||||
|
+++ b/cipher/Makefile.am
|
||||||
|
@@ -116,7 +116,7 @@ gost-s-box: gost-s-box.c
|
||||||
|
|
||||||
|
|
||||||
|
if ENABLE_O_FLAG_MUNGING
|
||||||
|
-o_flag_munging = sed -e 's/-O\([2-9s][2-9s]*\)/-O1/' -e 's/-Ofast/-O1/g'
|
||||||
|
+o_flag_munging = sed -e 's/ -O\([2-9s][2-9s]*\) / -O1 /' -e 's/ -Ofast / -O1 /g'
|
||||||
|
else
|
||||||
|
o_flag_munging = cat
|
||||||
|
endif
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,178 @@
|
||||||
|
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 3/3] 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>
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
[https://github.com/gpg/libgcrypt/commit/a4c561aab1014c3630bc88faf6f5246fee16b020]
|
||||||
|
|
||||||
|
CVE: CVE-2019-12904
|
||||||
|
|
||||||
|
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
|
||||||
|
---
|
||||||
|
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 11f119a..194e2ec 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
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
||||||
|
|
@ -0,0 +1,79 @@
|
||||||
|
From 7cc702c7b5a1ccc2b0091f3effa1391b6c3030fd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
Date: Wed, 16 Aug 2017 10:46:28 +0800
|
||||||
|
Subject: [PATCH 3/4] tests/bench-slope.c: workaround ICE failure on mips with
|
||||||
|
'-O -g'
|
||||||
|
|
||||||
|
Hit a ICE and could reduce it to the following minimal example:
|
||||||
|
|
||||||
|
1. Only the size of array assigned with 2 caused the issue:
|
||||||
|
$ cat > mipgcc-test.c << END
|
||||||
|
|
||||||
|
int main (int argc, char **argv)
|
||||||
|
{
|
||||||
|
char *pStrArry[ARRAY_SIZE_MAX] = {"hello"};
|
||||||
|
int i = 0;
|
||||||
|
|
||||||
|
while(pStrArry[i] && i<ARRAY_SIZE_MAX)
|
||||||
|
{
|
||||||
|
printf("%s\n", pStrArry[i]);
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
END
|
||||||
|
|
||||||
|
2. Only -O1 and -g on mips caused the issue:
|
||||||
|
$ mips-poky-linux-gcc -O1 -g -o mipgcc-test mipgcc-test.c
|
||||||
|
mipgcc-test.c: In function 'main':
|
||||||
|
mipgcc-test.c:18:1: internal compiler error: in dwarf2out_var_location,
|
||||||
|
at dwarf2out.c:20810
|
||||||
|
}
|
||||||
|
^
|
||||||
|
Please submit a full bug report,
|
||||||
|
with preprocessed source if appropriate.
|
||||||
|
See <http://gcc.gnu.org/bugs.html> for instructions
|
||||||
|
|
||||||
|
3. The quick workround is trying to enlarge the size of array with
|
||||||
|
larger
|
||||||
|
than 2.
|
||||||
|
|
||||||
|
4. File a bug to GNU, but it could not be reproduced on there
|
||||||
|
environment.
|
||||||
|
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=60643
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe specific]
|
||||||
|
|
||||||
|
Rebase to 1.8.0
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
tests/bench-slope.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tests/bench-slope.c b/tests/bench-slope.c
|
||||||
|
index 75e6e43..4e70842 100644
|
||||||
|
--- a/tests/bench-slope.c
|
||||||
|
+++ b/tests/bench-slope.c
|
||||||
|
@@ -1463,7 +1463,7 @@ static struct bench_ops hash_ops = {
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
-static struct bench_hash_mode hash_modes[] = {
|
||||||
|
+static struct bench_hash_mode hash_modes[3] = {
|
||||||
|
{"", &hash_ops},
|
||||||
|
{0},
|
||||||
|
};
|
||||||
|
@@ -1629,7 +1629,7 @@ static struct bench_ops mac_ops = {
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
-static struct bench_mac_mode mac_modes[] = {
|
||||||
|
+static struct bench_mac_mode mac_modes[3] = {
|
||||||
|
{"", &mac_ops},
|
||||||
|
{0},
|
||||||
|
};
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
From e20dbdb0b8f0af840ef90b299c4e2277c52ddf87 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
Date: Sun, 12 Jun 2016 04:44:29 -0400
|
||||||
|
Subject: [PATCH 4/4] tests/Makefile.am: fix undefined reference to
|
||||||
|
`pthread_create'
|
||||||
|
|
||||||
|
Add missing '-lpthread' to CFLAGS
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
---
|
||||||
|
tests/Makefile.am | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||||
|
index 1744ea7..04cf425 100644
|
||||||
|
--- a/tests/Makefile.am
|
||||||
|
+++ b/tests/Makefile.am
|
||||||
|
@@ -64,4 +64,4 @@ EXTRA_DIST = README rsa-16k.key cavs_tests.sh cavs_driver.pl \
|
||||||
|
|
||||||
|
LDADD = $(standard_ldadd) $(GPG_ERROR_LIBS)
|
||||||
|
t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS)
|
||||||
|
-t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS)
|
||||||
|
+t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
|
|
@ -0,0 +1,57 @@
|
||||||
|
SUMMARY = "General purpose cryptographic library based on the code from GnuPG"
|
||||||
|
HOMEPAGE = "http://directory.fsf.org/project/libgcrypt/"
|
||||||
|
BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
|
||||||
|
SECTION = "libs"
|
||||||
|
|
||||||
|
# helper program gcryptrnd and getrandom are under GPL, rest LGPL
|
||||||
|
LICENSE = "GPLv2+ & LGPLv2.1+ & GPLv3+"
|
||||||
|
LICENSE_${PN} = "LGPLv2.1+"
|
||||||
|
LICENSE_${PN}-dev = "GPLv2+ & LGPLv2.1+"
|
||||||
|
LICENSE_dumpsexp-dev = "GPLv3+"
|
||||||
|
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||||
|
file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
|
||||||
|
file://LICENSES;md5=840e3bcb754e5046ffeda7619034cbd8"
|
||||||
|
|
||||||
|
DEPENDS = "libgpg-error"
|
||||||
|
|
||||||
|
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
|
||||||
|
SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
|
||||||
|
file://0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch \
|
||||||
|
file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \
|
||||||
|
file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
|
||||||
|
file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
|
||||||
|
file://0001-Prefetch-GCM-look-up-tables.patch \
|
||||||
|
file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \
|
||||||
|
file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \
|
||||||
|
"
|
||||||
|
SRC_URI[md5sum] = "fbfdaebbbc6d7e5fbbf6ffdb3e139573"
|
||||||
|
SRC_URI[sha256sum] = "f638143a0672628fde0cad745e9b14deb85dffb175709cacc1f4fe24b93f2227"
|
||||||
|
|
||||||
|
BINCONFIG = "${bindir}/libgcrypt-config"
|
||||||
|
|
||||||
|
inherit autotools texinfo binconfig-disabled pkgconfig
|
||||||
|
|
||||||
|
EXTRA_OECONF = "--disable-asm"
|
||||||
|
EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
|
||||||
|
|
||||||
|
PACKAGECONFIG ??= "capabilities"
|
||||||
|
PACKAGECONFIG[capabilities] = "--with-capabilities,--without-capabilities,libcap"
|
||||||
|
|
||||||
|
do_configure_prepend () {
|
||||||
|
# Else this could be used in preference to the one in aclocal-copy
|
||||||
|
rm -f ${S}/m4/gpg-error.m4
|
||||||
|
}
|
||||||
|
|
||||||
|
# libgcrypt.pc is added locally and thus installed here
|
||||||
|
do_install_append() {
|
||||||
|
install -d ${D}/${libdir}/pkgconfig
|
||||||
|
install -m 0644 ${B}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
|
||||||
|
}
|
||||||
|
|
||||||
|
PACKAGES =+ "dumpsexp-dev"
|
||||||
|
|
||||||
|
FILES_${PN}-dev += "${bindir}/hmac256"
|
||||||
|
FILES_dumpsexp-dev += "${bindir}/dumpsexp"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
@ -0,0 +1,161 @@
|
||||||
|
Upstream-Status: Backport [https://dev.gnupg.org/T4459]
|
||||||
|
Signed-off-by: Sean Nyekjaer <sean@geanix.com>
|
||||||
|
|
||||||
|
From 37069826e497d6af01e3e48fe5d2220ae7f85449 Mon Sep 17 00:00:00 2001
|
||||||
|
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||||
|
Date: Mon, 15 Apr 2019 15:10:44 +0900
|
||||||
|
Subject: [PATCH] awk: Prepare for Gawk 5.0.
|
||||||
|
|
||||||
|
* src/Makefile.am: Use pkg_namespace (instead of namespace).
|
||||||
|
* src/mkerrnos.awk: Likewise.
|
||||||
|
* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
|
||||||
|
* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
|
||||||
|
|
||||||
|
--
|
||||||
|
|
||||||
|
In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
|
||||||
|
which only allows escaping specific characters.
|
||||||
|
|
||||||
|
GnuPG-bug-id: 4459
|
||||||
|
Reported-by: Marius Schamschula
|
||||||
|
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||||
|
---
|
||||||
|
lang/cl/mkerrcodes.awk | 2 +-
|
||||||
|
src/Makefile.am | 2 +-
|
||||||
|
src/mkerrcodes.awk | 2 +-
|
||||||
|
src/mkerrcodes1.awk | 2 +-
|
||||||
|
src/mkerrcodes2.awk | 2 +-
|
||||||
|
src/mkerrnos.awk | 2 +-
|
||||||
|
src/mkstrtable.awk | 10 +++++-----
|
||||||
|
7 files changed, 11 insertions(+), 11 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
|
||||||
|
index ae29043..9a1fc18 100644
|
||||||
|
--- a/lang/cl/mkerrcodes.awk
|
||||||
|
+++ b/lang/cl/mkerrcodes.awk
|
||||||
|
@@ -122,7 +122,7 @@ header {
|
||||||
|
}
|
||||||
|
|
||||||
|
!header {
|
||||||
|
- sub (/\#.+/, "");
|
||||||
|
+ sub (/#.+/, "");
|
||||||
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||||
|
|
||||||
|
if (/^$/)
|
||||||
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||||
|
index 42998e4..0ceac9f 100644
|
||||||
|
--- a/src/Makefile.am
|
||||||
|
+++ b/src/Makefile.am
|
||||||
|
@@ -281,7 +281,7 @@ code-from-errno.h: mkerrcodes Makefile
|
||||||
|
|
||||||
|
errnos-sym.h: Makefile mkstrtable.awk errnos.in
|
||||||
|
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
|
||||||
|
- -v prefix=GPG_ERR_ -v namespace=errnos_ \
|
||||||
|
+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
|
||||||
|
$(srcdir)/errnos.in >$@
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
|
||||||
|
index 46d436c..e9c857c 100644
|
||||||
|
--- a/src/mkerrcodes.awk
|
||||||
|
+++ b/src/mkerrcodes.awk
|
||||||
|
@@ -85,7 +85,7 @@ header {
|
||||||
|
}
|
||||||
|
|
||||||
|
!header {
|
||||||
|
- sub (/\#.+/, "");
|
||||||
|
+ sub (/#.+/, "");
|
||||||
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||||
|
|
||||||
|
if (/^$/)
|
||||||
|
diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
|
||||||
|
index a771a73..4578e29 100644
|
||||||
|
--- a/src/mkerrcodes1.awk
|
||||||
|
+++ b/src/mkerrcodes1.awk
|
||||||
|
@@ -81,7 +81,7 @@ header {
|
||||||
|
}
|
||||||
|
|
||||||
|
!header {
|
||||||
|
- sub (/\#.+/, "");
|
||||||
|
+ sub (/#.+/, "");
|
||||||
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||||
|
|
||||||
|
if (/^$/)
|
||||||
|
diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
|
||||||
|
index ea58503..188f7a4 100644
|
||||||
|
--- a/src/mkerrcodes2.awk
|
||||||
|
+++ b/src/mkerrcodes2.awk
|
||||||
|
@@ -91,7 +91,7 @@ header {
|
||||||
|
}
|
||||||
|
|
||||||
|
!header {
|
||||||
|
- sub (/\#.+/, "");
|
||||||
|
+ sub (/#.+/, "");
|
||||||
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||||
|
|
||||||
|
if (/^$/)
|
||||||
|
diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
|
||||||
|
index f79df66..15b1aad 100644
|
||||||
|
--- a/src/mkerrnos.awk
|
||||||
|
+++ b/src/mkerrnos.awk
|
||||||
|
@@ -83,7 +83,7 @@ header {
|
||||||
|
}
|
||||||
|
|
||||||
|
!header {
|
||||||
|
- sub (/\#.+/, "");
|
||||||
|
+ sub (/#.+/, "");
|
||||||
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||||
|
|
||||||
|
if (/^$/)
|
||||||
|
diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
|
||||||
|
index c9de9c1..285e45f 100644
|
||||||
|
--- a/src/mkstrtable.awk
|
||||||
|
+++ b/src/mkstrtable.awk
|
||||||
|
@@ -77,7 +77,7 @@
|
||||||
|
#
|
||||||
|
# The variable prefix can be used to prepend a string to each message.
|
||||||
|
#
|
||||||
|
-# The variable namespace can be used to prepend a string to each
|
||||||
|
+# The variable pkg_namespace can be used to prepend a string to each
|
||||||
|
# variable and macro name.
|
||||||
|
|
||||||
|
BEGIN {
|
||||||
|
@@ -102,7 +102,7 @@ header {
|
||||||
|
print "/* The purpose of this complex string table is to produce";
|
||||||
|
print " optimal code with a minimum of relocations. */";
|
||||||
|
print "";
|
||||||
|
- print "static const char " namespace "msgstr[] = ";
|
||||||
|
+ print "static const char " pkg_namespace "msgstr[] = ";
|
||||||
|
header = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -110,7 +110,7 @@ header {
|
||||||
|
}
|
||||||
|
|
||||||
|
!header {
|
||||||
|
- sub (/\#.+/, "");
|
||||||
|
+ sub (/#.+/, "");
|
||||||
|
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
|
||||||
|
|
||||||
|
if (/^$/)
|
||||||
|
@@ -150,7 +150,7 @@ END {
|
||||||
|
else
|
||||||
|
print " gettext_noop (\"" last_msgstr "\");";
|
||||||
|
print "";
|
||||||
|
- print "static const int " namespace "msgidx[] =";
|
||||||
|
+ print "static const int " pkg_namespace "msgidx[] =";
|
||||||
|
print " {";
|
||||||
|
for (i = 0; i < coded_msgs; i++)
|
||||||
|
print " " pos[i] ",";
|
||||||
|
@@ -158,7 +158,7 @@ END {
|
||||||
|
print " };";
|
||||||
|
print "";
|
||||||
|
print "static GPG_ERR_INLINE int";
|
||||||
|
- print namespace "msgidxof (int code)";
|
||||||
|
+ print pkg_namespace "msgidxof (int code)";
|
||||||
|
print "{";
|
||||||
|
print " return (0 ? 0";
|
||||||
|
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,183 @@
|
||||||
|
From ec309e20b5a27d42a5fb915c328d61e924ab5f19 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
Date: Thu, 29 Mar 2018 15:12:17 +0800
|
||||||
|
Subject: [PATCH] support pkgconfig
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Rebase to 1.28
|
||||||
|
|
||||||
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||||
|
|
||||||
|
Refactored for 1.33
|
||||||
|
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||||
|
|
||||||
|
---
|
||||||
|
configure.ac | 1 +
|
||||||
|
src/gpg-error.m4 | 71 +++--------------------------------------------------
|
||||||
|
4 files changed, 18 insertions(+), 69 deletions(-)
|
||||||
|
create mode 100644 src/gpg-error.pc.in
|
||||||
|
|
||||||
|
Index: libgpg-error-1.33/src/gpg-error.m4
|
||||||
|
===================================================================
|
||||||
|
--- libgpg-error-1.33.orig/src/gpg-error.m4
|
||||||
|
+++ libgpg-error-1.33/src/gpg-error.m4
|
||||||
|
@@ -26,139 +26,13 @@ dnl is added to the gpg_config_script_wa
|
||||||
|
dnl
|
||||||
|
AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||||
|
[ AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
- gpg_error_config_prefix=""
|
||||||
|
- dnl --with-libgpg-error-prefix=PFX is the preferred name for this option,
|
||||||
|
- dnl since that is consistent with how our three siblings use the directory/
|
||||||
|
- dnl package name in --with-$dir_name-prefix=PFX.
|
||||||
|
- AC_ARG_WITH(libgpg-error-prefix,
|
||||||
|
- AC_HELP_STRING([--with-libgpg-error-prefix=PFX],
|
||||||
|
- [prefix where GPG Error is installed (optional)]),
|
||||||
|
- [gpg_error_config_prefix="$withval"])
|
||||||
|
+ min_gpg_error_version=ifelse([$1], ,0.0,$1)
|
||||||
|
+ PKG_CHECK_MODULES(GPG_ERROR, [gpg-error >= $min_gpg_error_version], [ok=yes], [ok=no])
|
||||||
|
|
||||||
|
- dnl Accept --with-gpg-error-prefix and make it work the same as
|
||||||
|
- dnl --with-libgpg-error-prefix above, for backwards compatibility,
|
||||||
|
- dnl but do not document this old, inconsistently-named option.
|
||||||
|
- AC_ARG_WITH(gpg-error-prefix,,
|
||||||
|
- [gpg_error_config_prefix="$withval"])
|
||||||
|
-
|
||||||
|
- if test x"${GPG_ERROR_CONFIG}" = x ; then
|
||||||
|
- if test x"${gpg_error_config_prefix}" != x ; then
|
||||||
|
- GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config"
|
||||||
|
- else
|
||||||
|
- case "${SYSROOT}" in
|
||||||
|
- /*)
|
||||||
|
- if test -x "${SYSROOT}/bin/gpg-error-config" ; then
|
||||||
|
- GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config"
|
||||||
|
- fi
|
||||||
|
- ;;
|
||||||
|
- '')
|
||||||
|
- ;;
|
||||||
|
- *)
|
||||||
|
- AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
|
||||||
|
- ;;
|
||||||
|
- esac
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no)
|
||||||
|
- min_gpg_error_version=ifelse([$1], ,1.33,$1)
|
||||||
|
- ok=no
|
||||||
|
-
|
||||||
|
- if test "$prefix" = NONE ; then
|
||||||
|
- prefix_option_expanded=/usr/local
|
||||||
|
- else
|
||||||
|
- prefix_option_expanded="$prefix"
|
||||||
|
- fi
|
||||||
|
- if test "$exec_prefix" = NONE ; then
|
||||||
|
- exec_prefix_option_expanded=$prefix_option_expanded
|
||||||
|
- else
|
||||||
|
- exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix)
|
||||||
|
- fi
|
||||||
|
- libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir)
|
||||||
|
-
|
||||||
|
- if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then
|
||||||
|
- gpgrt_libdir=$libdir_option_expanded
|
||||||
|
- else
|
||||||
|
- if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then
|
||||||
|
- if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then
|
||||||
|
- if test -f $possible_libdir/pkgconfig/gpg-error.pc; then
|
||||||
|
- gpgrt_libdir=$possible_libdir
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then
|
||||||
|
- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
||||||
|
- if test "$GPGRT_CONFIG" = "no"; then
|
||||||
|
- unset GPGRT_CONFIG
|
||||||
|
- else
|
||||||
|
- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||||
|
- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||||
|
- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||||
|
- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||||
|
- gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
|
||||||
|
- else
|
||||||
|
- unset GPGRT_CONFIG
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- else
|
||||||
|
- gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
|
||||||
|
- fi
|
||||||
|
- if test "$GPG_ERROR_CONFIG" != "no"; then
|
||||||
|
- req_major=`echo $min_gpg_error_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||||
|
- req_minor=`echo $min_gpg_error_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||||
|
- major=`echo $gpg_error_config_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||||
|
- minor=`echo $gpg_error_config_version | \
|
||||||
|
- sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
||||||
|
- if test "$major" -gt "$req_major"; then
|
||||||
|
- ok=yes
|
||||||
|
- else
|
||||||
|
- if test "$major" -eq "$req_major"; then
|
||||||
|
- if test "$minor" -ge "$req_minor"; then
|
||||||
|
- ok=yes
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then
|
||||||
|
- if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then
|
||||||
|
- AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no)
|
||||||
|
- if test "$GPGRT_CONFIG" = "no"; then
|
||||||
|
- unset GPGRT_CONFIG
|
||||||
|
- else
|
||||||
|
- GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir"
|
||||||
|
- if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then
|
||||||
|
- GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
|
||||||
|
- AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
|
||||||
|
- else
|
||||||
|
- unset GPGRT_CONFIG
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version)
|
||||||
|
if test $ok = yes; then
|
||||||
|
- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags`
|
||||||
|
- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs`
|
||||||
|
- if test -z "$GPGRT_CONFIG"; then
|
||||||
|
- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null`
|
||||||
|
- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null`
|
||||||
|
- else
|
||||||
|
- GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null`
|
||||||
|
- GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS"
|
||||||
|
- GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null`
|
||||||
|
- GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS"
|
||||||
|
- fi
|
||||||
|
- AC_MSG_RESULT([yes ($gpg_error_config_version)])
|
||||||
|
ifelse([$2], , :, [$2])
|
||||||
|
if test -z "$GPGRT_CONFIG"; then
|
||||||
|
- gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none`
|
||||||
|
- else
|
||||||
|
- gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none`
|
||||||
|
+ gpg_error_config_host=`$PKG_CONFIG --variable=host gpg-error`
|
||||||
|
fi
|
||||||
|
if test x"$gpg_error_config_host" != xnone ; then
|
||||||
|
if test x"$gpg_error_config_host" != x"$host" ; then
|
||||||
|
@@ -174,15 +48,6 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
- GPG_ERROR_CFLAGS=""
|
||||||
|
- GPG_ERROR_LIBS=""
|
||||||
|
- GPG_ERROR_MT_CFLAGS=""
|
||||||
|
- GPG_ERROR_MT_LIBS=""
|
||||||
|
- AC_MSG_RESULT(no)
|
||||||
|
ifelse([$3], , :, [$3])
|
||||||
|
fi
|
||||||
|
- AC_SUBST(GPG_ERROR_CFLAGS)
|
||||||
|
- AC_SUBST(GPG_ERROR_LIBS)
|
||||||
|
- AC_SUBST(GPG_ERROR_MT_CFLAGS)
|
||||||
|
- AC_SUBST(GPG_ERROR_MT_LIBS)
|
||||||
|
])
|
||||||
|
|
@ -0,0 +1,55 @@
|
||||||
|
SUMMARY = "Small library that defines common error values for all GnuPG components"
|
||||||
|
HOMEPAGE = "http://www.gnupg.org/related_software/libgpg-error/"
|
||||||
|
BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
|
||||||
|
|
||||||
|
LICENSE = "GPLv2+ & LGPLv2.1+"
|
||||||
|
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
|
||||||
|
file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
|
||||||
|
file://src/gpg-error.h.in;beginline=2;endline=18;md5=cd91e3ad1265a0c268efad541a39345e \
|
||||||
|
file://src/init.c;beginline=2;endline=17;md5=f01cdfcf747af5380590cfd9bbfeaaf7"
|
||||||
|
|
||||||
|
SECTION = "libs"
|
||||||
|
|
||||||
|
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
|
||||||
|
SRC_URI = "${GNUPG_MIRROR}/libgpg-error/libgpg-error-${PV}.tar.bz2 \
|
||||||
|
file://pkgconfig.patch \
|
||||||
|
file://libgpg-error-1.35-gawk5-support.patch \
|
||||||
|
"
|
||||||
|
|
||||||
|
SRC_URI[md5sum] = "2808a9e044f883f7554c5ba6a380b711"
|
||||||
|
SRC_URI[sha256sum] = "cbd5ee62a8a8c88d48c158fff4fc9ead4132aacd1b4a56eb791f9f997d07e067"
|
||||||
|
|
||||||
|
BINCONFIG = "${bindir}/gpg-error-config"
|
||||||
|
|
||||||
|
inherit autotools binconfig-disabled pkgconfig gettext
|
||||||
|
CPPFLAGS += "-P"
|
||||||
|
do_compile_prepend() {
|
||||||
|
TARGET_FILE=linux-gnu
|
||||||
|
if [ ${TARGET_OS} != "linux" ]; then
|
||||||
|
TARGET_FILE=${TARGET_OS}
|
||||||
|
fi
|
||||||
|
|
||||||
|
case ${TARGET_ARCH} in
|
||||||
|
aarch64_be) TUPLE=aarch64-unknown-linux-gnu ;;
|
||||||
|
arm) TUPLE=arm-unknown-linux-gnueabi ;;
|
||||||
|
armeb) TUPLE=arm-unknown-linux-gnueabi ;;
|
||||||
|
i586|i686) TUPLE=i686-pc-linux-gnu ;;
|
||||||
|
mips*el) TUPLE=mipsel-unknown-linux-gnu ;;
|
||||||
|
mips*) TUPLE=mips-unknown-linux-gnu ;;
|
||||||
|
x86_64) TUPLE=x86_64-pc-linux-gnu ;;
|
||||||
|
*) TUPLE=${TARGET_ARCH}-unknown-linux-gnu ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
cp ${S}/src/syscfg/lock-obj-pub.$TUPLE.h \
|
||||||
|
${S}/src/syscfg/lock-obj-pub.$TARGET_FILE.h
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install_append() {
|
||||||
|
# we don't have common lisp in OE
|
||||||
|
rm -rf "${D}${datadir}/common-lisp/"
|
||||||
|
}
|
||||||
|
|
||||||
|
FILES_${PN}-dev += "${bindir}/gpg-error"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native"
|
||||||
|
|
||||||
Loading…
Reference in New Issue