[PATCH 1/2] Add ARIA block cipher

Jussi Kivilinna jussi.kivilinna at iki.fi
Fri Jan 6 09:57:17 CET 2023


* cipher/Makefile.am: Add 'aria.c'.
* cipher/aria.c: New.
* cipher/cipher.c (cipher_list, cipher_list_algo301): Add ARIA cipher
specs.
* cipher/mac-cmac.c (map_mac_algo_to_cipher): Add GCRY_MAC_CMAC_ARIA.
(_gcry_mac_type_spec_cmac_aria): New.
* cipher/mac-gmac.c (map_mac_algo_to_cipher): Add GCRY_MAC_GMAC_ARIA.
(_gcry_mac_type_spec_gmac_aria): New.
* cipher/mac-internal.h (_gcry_mac_type_spec_cmac_aria)
(_gcry_mac_type_spec_gmac_aria)
(_gcry_mac_type_spec_poly1305mac_aria): New.
* cipher/mac-poly1305.c (poly1305mac_open): Add GCRY_MAC_GMAC_ARIA.
(_gcry_mac_type_spec_poly1305mac_aria): New.
* cipher/mac.c (mac_list, mac_list_algo201, mac_list_algo401)
(mac_list_algo501): Add ARIA MAC specs.
* configure.ac (available_ciphers): Add 'aria'.
(GCRYPT_CIPHERS): Add 'aria.lo'.
(USE_ARIA): New.
* doc/gcrypt.texi: Add GCRY_CIPHER_ARIA128, GCRY_CIPHER_ARIA192,
GCRY_CIPHER_ARIA256, GCRY_MAC_CMAC_ARIA, GCRY_MAC_GMAC_ARIA and
GCRY_MAC_POLY1305_ARIA.
* src/cipher.h (_gcry_cipher_spec_aria128, _gcry_cipher_spec_aria192)
(_gcry_cipher_spec_aria256): New.
* src/gcrypt.h.in (gcry_cipher_algos): Add GCRY_CIPHER_ARIA128,
GCRY_CIPHER_ARIA192 and GCRY_CIPHER_ARIA256.
(gcry_mac_algos): GCRY_MAC_CMAC_ARIA, GCRY_MAC_GMAC_ARIA and
GCRY_MAC_POLY1305_ARIA.
* tests/basic.c (check_ecb_cipher, check_ctr_cipher)
(check_cfb_cipher, check_ocb_cipher) [USE_ARIA]: Add ARIA test-vectors.
(check_ciphers) [USE_ARIA]: Add GCRY_CIPHER_ARIA128, GCRY_CIPHER_ARIA192
and GCRY_CIPHER_ARIA256.
(main): Also run 'check_bulk_cipher_modes' for 'cipher_modes_only'-mode.
* tests/bench-slope.c (bench_mac_init): Add GCRY_MAC_POLY1305_ARIA
setiv-handling.
* tests/benchmark.c (mac_bench): Likewise.
--

This patch adds ARIA block cipher for libgcrypt. This implementation
is based on work by Taehee Yoo, with following notable changes:
 - Integration to libgcrypt, use of bithelp.h and bufhelp.h helper
   functions where possible.
 - Added lookup table prefetching as is done in AES, GCM and SM4
   implementations.
 - Changed `get_u8` to return `u32` as returning `byte` caused
   sub-optimal code generation with gcc-12/x86-64 (zero extending
   from 8-bit to 32-bit register, followed by extraneous sign
   extending from 32-bit to 64-bit register).
 - Changed 'aria_crypt' loop structure a bit for tiny performance
   increase (~1% seen with gcc-12/x86-64/zen4).

Benchmark on AMD Ryzen 9 7900X (x86-64):

 ARIA128        |  nanosecs/byte   mebibytes/sec   cycles/byte  auto Mhz
        ECB enc |      3.99 ns/B     239.1 MiB/s     22.43 c/B      5625
        ECB dec |      4.00 ns/B     238.4 MiB/s     22.50 c/B      5625

Benchmark on AMD Ryzen 9 7900X (win32):

 ARIA128        |  nanosecs/byte   mebibytes/sec   cycles/byte  auto Mhz
        ECB enc |      4.57 ns/B     208.7 MiB/s     25.31 c/B      5538
        ECB dec |      4.66 ns/B     204.8 MiB/s     25.39 c/B      5453

Benchmark on ARM Cortex-A53 (aarch64):

 ARIA128        |  nanosecs/byte   mebibytes/sec   cycles/byte  auto Mhz
        ECB enc |     74.69 ns/B     12.77 MiB/s     48.40 c/B     647.9
        ECB dec |     74.99 ns/B     12.72 MiB/s     48.58 c/B     647.9

Cc: Taehee Yoo <ap420073 at gmail.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
---
 cipher/Makefile.am    |   1 +
 cipher/aria.c         | 928 ++++++++++++++++++++++++++++++++++++++++++
 cipher/cipher.c       |  16 +-
 cipher/mac-cmac.c     |   8 +
 cipher/mac-gmac.c     |   8 +
 cipher/mac-internal.h |   9 +
 cipher/mac-poly1305.c |   9 +
 cipher/mac.c          |  26 +-
 configure.ac          |   8 +-
 doc/gcrypt.texi       |  21 +
 src/cipher.h          |   3 +
 src/gcrypt.h.in       |  10 +-
 tests/basic.c         | 453 +++++++++++++++++++++
 tests/bench-slope.c   |   1 +
 tests/benchmark.c     |   2 +-
 15 files changed, 1495 insertions(+), 8 deletions(-)
 create mode 100644 cipher/aria.c

diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 8e47e5be..7ebcd179 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -77,6 +77,7 @@ EXTRA_libcipher_la_SOURCES = \
 	asm-poly1305-aarch64.h \
 	asm-poly1305-amd64.h \
 	asm-poly1305-s390x.h \
+	aria.c \
 	arcfour.c arcfour-amd64.S \
 	blowfish.c blowfish-amd64.S blowfish-arm.S \
 	cast5.c cast5-amd64.S cast5-arm.S \
diff --git a/cipher/aria.c b/cipher/aria.c
new file mode 100644
index 00000000..893763a9
--- /dev/null
+++ b/cipher/aria.c
@@ -0,0 +1,928 @@
+/* aria.c  -  ARIA Cipher Algorithm
+ *
+ * Copyright (C) 2022-2023 Taehee Yoo <ap420073 at gmail.com>
+ * Copyright (C) 2023 Jussi Kivilinna <jussi.kivilinna at iki.fi>
+ *
+ * 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/>.
+ */
+
+#include <config.h>
+
+#include "types.h"
+#include "g10lib.h"
+#include "cipher.h"
+#include "bufhelp.h"
+#include "cipher-internal.h"
+#include "bulkhelp.h"
+
+/* Attribute macro to force alignment to 64 bytes.  */
+#ifdef HAVE_GCC_ATTRIBUTE_ALIGNED
+# define ATTR_ALIGNED_64  __attribute__ ((aligned (64)))
+#else
+# define ATTR_ALIGNED_64
+#endif
+
+/* Attribute macro to force inlining of function. */
+#if __GNUC__ >= 4
+#  define ALWAYS_INLINE inline __attribute__ ((always_inline))
+#else
+#  define ALWAYS_INLINE inline
+#endif
+
+/* Attribute macro to prevent inlining of function. */
+#if __GNUC__ >= 4
+#  define NO_INLINE __attribute__ ((noinline))
+#else
+#  define NO_INLINE
+#endif
+
+
+static const char *aria_selftest (void);
+
+
+#define ARIA_MIN_KEY_SIZE	16
+#define ARIA_MAX_KEY_SIZE	32
+#define ARIA_BLOCK_SIZE		16
+#define ARIA_MAX_RD_KEYS	17
+#define ARIA_RD_KEY_WORDS	(ARIA_BLOCK_SIZE / sizeof(u32))
+
+
+typedef struct
+{
+  u32 enc_key[ARIA_MAX_RD_KEYS][ARIA_RD_KEY_WORDS];
+  u32 dec_key[ARIA_MAX_RD_KEYS][ARIA_RD_KEY_WORDS];
+  int rounds;
+
+  /* The decryption key schedule is available */
+  unsigned int decryption_prepared:1;
+} ARIA_context;
+
+
+static const u32 key_rc[20] =
+  {
+    0x517cc1b7, 0x27220a94, 0xfe13abe8, 0xfa9a6ee0,
+    0x6db14acc, 0x9e21c820, 0xff28b1d5, 0xef5de2b0,
+    0xdb92371d, 0x2126e970, 0x03249775, 0x04e8c90e,
+    0x517cc1b7, 0x27220a94, 0xfe13abe8, 0xfa9a6ee0,
+    0x6db14acc, 0x9e21c820, 0xff28b1d5, 0xef5de2b0
+  };
+
+
+static struct
+{
+  volatile u32 counter_head;
+  u32 cacheline_align[64 / 4 - 1];
+  u32 s1[256];
+  u32 s2[256];
+  u32 x1[256];
+  u32 x2[256];
+  volatile u32 counter_tail;
+} sboxes ATTR_ALIGNED_64 =
+  {
+    0,
+    { 0, },
+
+    { /* s1 */
+      0x00636363, 0x007c7c7c, 0x00777777, 0x007b7b7b,
+      0x00f2f2f2, 0x006b6b6b, 0x006f6f6f, 0x00c5c5c5,
+      0x00303030, 0x00010101, 0x00676767, 0x002b2b2b,
+      0x00fefefe, 0x00d7d7d7, 0x00ababab, 0x00767676,
+      0x00cacaca, 0x00828282, 0x00c9c9c9, 0x007d7d7d,
+      0x00fafafa, 0x00595959, 0x00474747, 0x00f0f0f0,
+      0x00adadad, 0x00d4d4d4, 0x00a2a2a2, 0x00afafaf,
+      0x009c9c9c, 0x00a4a4a4, 0x00727272, 0x00c0c0c0,
+      0x00b7b7b7, 0x00fdfdfd, 0x00939393, 0x00262626,
+      0x00363636, 0x003f3f3f, 0x00f7f7f7, 0x00cccccc,
+      0x00343434, 0x00a5a5a5, 0x00e5e5e5, 0x00f1f1f1,
+      0x00717171, 0x00d8d8d8, 0x00313131, 0x00151515,
+      0x00040404, 0x00c7c7c7, 0x00232323, 0x00c3c3c3,
+      0x00181818, 0x00969696, 0x00050505, 0x009a9a9a,
+      0x00070707, 0x00121212, 0x00808080, 0x00e2e2e2,
+      0x00ebebeb, 0x00272727, 0x00b2b2b2, 0x00757575,
+      0x00090909, 0x00838383, 0x002c2c2c, 0x001a1a1a,
+      0x001b1b1b, 0x006e6e6e, 0x005a5a5a, 0x00a0a0a0,
+      0x00525252, 0x003b3b3b, 0x00d6d6d6, 0x00b3b3b3,
+      0x00292929, 0x00e3e3e3, 0x002f2f2f, 0x00848484,
+      0x00535353, 0x00d1d1d1, 0x00000000, 0x00ededed,
+      0x00202020, 0x00fcfcfc, 0x00b1b1b1, 0x005b5b5b,
+      0x006a6a6a, 0x00cbcbcb, 0x00bebebe, 0x00393939,
+      0x004a4a4a, 0x004c4c4c, 0x00585858, 0x00cfcfcf,
+      0x00d0d0d0, 0x00efefef, 0x00aaaaaa, 0x00fbfbfb,
+      0x00434343, 0x004d4d4d, 0x00333333, 0x00858585,
+      0x00454545, 0x00f9f9f9, 0x00020202, 0x007f7f7f,
+      0x00505050, 0x003c3c3c, 0x009f9f9f, 0x00a8a8a8,
+      0x00515151, 0x00a3a3a3, 0x00404040, 0x008f8f8f,
+      0x00929292, 0x009d9d9d, 0x00383838, 0x00f5f5f5,
+      0x00bcbcbc, 0x00b6b6b6, 0x00dadada, 0x00212121,
+      0x00101010, 0x00ffffff, 0x00f3f3f3, 0x00d2d2d2,
+      0x00cdcdcd, 0x000c0c0c, 0x00131313, 0x00ececec,
+      0x005f5f5f, 0x00979797, 0x00444444, 0x00171717,
+      0x00c4c4c4, 0x00a7a7a7, 0x007e7e7e, 0x003d3d3d,
+      0x00646464, 0x005d5d5d, 0x00191919, 0x00737373,
+      0x00606060, 0x00818181, 0x004f4f4f, 0x00dcdcdc,
+      0x00222222, 0x002a2a2a, 0x00909090, 0x00888888,
+      0x00464646, 0x00eeeeee, 0x00b8b8b8, 0x00141414,
+      0x00dedede, 0x005e5e5e, 0x000b0b0b, 0x00dbdbdb,
+      0x00e0e0e0, 0x00323232, 0x003a3a3a, 0x000a0a0a,
+      0x00494949, 0x00060606, 0x00242424, 0x005c5c5c,
+      0x00c2c2c2, 0x00d3d3d3, 0x00acacac, 0x00626262,
+      0x00919191, 0x00959595, 0x00e4e4e4, 0x00797979,
+      0x00e7e7e7, 0x00c8c8c8, 0x00373737, 0x006d6d6d,
+      0x008d8d8d, 0x00d5d5d5, 0x004e4e4e, 0x00a9a9a9,
+      0x006c6c6c, 0x00565656, 0x00f4f4f4, 0x00eaeaea,
+      0x00656565, 0x007a7a7a, 0x00aeaeae, 0x00080808,
+      0x00bababa, 0x00787878, 0x00252525, 0x002e2e2e,
+      0x001c1c1c, 0x00a6a6a6, 0x00b4b4b4, 0x00c6c6c6,
+      0x00e8e8e8, 0x00dddddd, 0x00747474, 0x001f1f1f,
+      0x004b4b4b, 0x00bdbdbd, 0x008b8b8b, 0x008a8a8a,
+      0x00707070, 0x003e3e3e, 0x00b5b5b5, 0x00666666,
+      0x00484848, 0x00030303, 0x00f6f6f6, 0x000e0e0e,
+      0x00616161, 0x00353535, 0x00575757, 0x00b9b9b9,
+      0x00868686, 0x00c1c1c1, 0x001d1d1d, 0x009e9e9e,
+      0x00e1e1e1, 0x00f8f8f8, 0x00989898, 0x00111111,
+      0x00696969, 0x00d9d9d9, 0x008e8e8e, 0x00949494,
+      0x009b9b9b, 0x001e1e1e, 0x00878787, 0x00e9e9e9,
+      0x00cecece, 0x00555555, 0x00282828, 0x00dfdfdf,
+      0x008c8c8c, 0x00a1a1a1, 0x00898989, 0x000d0d0d,
+      0x00bfbfbf, 0x00e6e6e6, 0x00424242, 0x00686868,
+      0x00414141, 0x00999999, 0x002d2d2d, 0x000f0f0f,
+      0x00b0b0b0, 0x00545454, 0x00bbbbbb, 0x00161616
+    },
+    { /* s2 */
+      0xe200e2e2, 0x4e004e4e, 0x54005454, 0xfc00fcfc,
+      0x94009494, 0xc200c2c2, 0x4a004a4a, 0xcc00cccc,
+      0x62006262, 0x0d000d0d, 0x6a006a6a, 0x46004646,
+      0x3c003c3c, 0x4d004d4d, 0x8b008b8b, 0xd100d1d1,
+      0x5e005e5e, 0xfa00fafa, 0x64006464, 0xcb00cbcb,
+      0xb400b4b4, 0x97009797, 0xbe00bebe, 0x2b002b2b,
+      0xbc00bcbc, 0x77007777, 0x2e002e2e, 0x03000303,
+      0xd300d3d3, 0x19001919, 0x59005959, 0xc100c1c1,
+      0x1d001d1d, 0x06000606, 0x41004141, 0x6b006b6b,
+      0x55005555, 0xf000f0f0, 0x99009999, 0x69006969,
+      0xea00eaea, 0x9c009c9c, 0x18001818, 0xae00aeae,
+      0x63006363, 0xdf00dfdf, 0xe700e7e7, 0xbb00bbbb,
+      0x00000000, 0x73007373, 0x66006666, 0xfb00fbfb,
+      0x96009696, 0x4c004c4c, 0x85008585, 0xe400e4e4,
+      0x3a003a3a, 0x09000909, 0x45004545, 0xaa00aaaa,
+      0x0f000f0f, 0xee00eeee, 0x10001010, 0xeb00ebeb,
+      0x2d002d2d, 0x7f007f7f, 0xf400f4f4, 0x29002929,
+      0xac00acac, 0xcf00cfcf, 0xad00adad, 0x91009191,
+      0x8d008d8d, 0x78007878, 0xc800c8c8, 0x95009595,
+      0xf900f9f9, 0x2f002f2f, 0xce00cece, 0xcd00cdcd,
+      0x08000808, 0x7a007a7a, 0x88008888, 0x38003838,
+      0x5c005c5c, 0x83008383, 0x2a002a2a, 0x28002828,
+      0x47004747, 0xdb00dbdb, 0xb800b8b8, 0xc700c7c7,
+      0x93009393, 0xa400a4a4, 0x12001212, 0x53005353,
+      0xff00ffff, 0x87008787, 0x0e000e0e, 0x31003131,
+      0x36003636, 0x21002121, 0x58005858, 0x48004848,
+      0x01000101, 0x8e008e8e, 0x37003737, 0x74007474,
+      0x32003232, 0xca00caca, 0xe900e9e9, 0xb100b1b1,
+      0xb700b7b7, 0xab00abab, 0x0c000c0c, 0xd700d7d7,
+      0xc400c4c4, 0x56005656, 0x42004242, 0x26002626,
+      0x07000707, 0x98009898, 0x60006060, 0xd900d9d9,
+      0xb600b6b6, 0xb900b9b9, 0x11001111, 0x40004040,
+      0xec00ecec, 0x20002020, 0x8c008c8c, 0xbd00bdbd,
+      0xa000a0a0, 0xc900c9c9, 0x84008484, 0x04000404,
+      0x49004949, 0x23002323, 0xf100f1f1, 0x4f004f4f,
+      0x50005050, 0x1f001f1f, 0x13001313, 0xdc00dcdc,
+      0xd800d8d8, 0xc000c0c0, 0x9e009e9e, 0x57005757,
+      0xe300e3e3, 0xc300c3c3, 0x7b007b7b, 0x65006565,
+      0x3b003b3b, 0x02000202, 0x8f008f8f, 0x3e003e3e,
+      0xe800e8e8, 0x25002525, 0x92009292, 0xe500e5e5,
+      0x15001515, 0xdd00dddd, 0xfd00fdfd, 0x17001717,
+      0xa900a9a9, 0xbf00bfbf, 0xd400d4d4, 0x9a009a9a,
+      0x7e007e7e, 0xc500c5c5, 0x39003939, 0x67006767,
+      0xfe00fefe, 0x76007676, 0x9d009d9d, 0x43004343,
+      0xa700a7a7, 0xe100e1e1, 0xd000d0d0, 0xf500f5f5,
+      0x68006868, 0xf200f2f2, 0x1b001b1b, 0x34003434,
+      0x70007070, 0x05000505, 0xa300a3a3, 0x8a008a8a,
+      0xd500d5d5, 0x79007979, 0x86008686, 0xa800a8a8,
+      0x30003030, 0xc600c6c6, 0x51005151, 0x4b004b4b,
+      0x1e001e1e, 0xa600a6a6, 0x27002727, 0xf600f6f6,
+      0x35003535, 0xd200d2d2, 0x6e006e6e, 0x24002424,
+      0x16001616, 0x82008282, 0x5f005f5f, 0xda00dada,
+      0xe600e6e6, 0x75007575, 0xa200a2a2, 0xef00efef,
+      0x2c002c2c, 0xb200b2b2, 0x1c001c1c, 0x9f009f9f,
+      0x5d005d5d, 0x6f006f6f, 0x80008080, 0x0a000a0a,
+      0x72007272, 0x44004444, 0x9b009b9b, 0x6c006c6c,
+      0x90009090, 0x0b000b0b, 0x5b005b5b, 0x33003333,
+      0x7d007d7d, 0x5a005a5a, 0x52005252, 0xf300f3f3,
+      0x61006161, 0xa100a1a1, 0xf700f7f7, 0xb000b0b0,
+      0xd600d6d6, 0x3f003f3f, 0x7c007c7c, 0x6d006d6d,
+      0xed00eded, 0x14001414, 0xe000e0e0, 0xa500a5a5,
+      0x3d003d3d, 0x22002222, 0xb300b3b3, 0xf800f8f8,
+      0x89008989, 0xde00dede, 0x71007171, 0x1a001a1a,
+      0xaf00afaf, 0xba00baba, 0xb500b5b5, 0x81008181
+    },
+    { /* x1 */
+      0x52520052, 0x09090009, 0x6a6a006a, 0xd5d500d5,
+      0x30300030, 0x36360036, 0xa5a500a5, 0x38380038,
+      0xbfbf00bf, 0x40400040, 0xa3a300a3, 0x9e9e009e,
+      0x81810081, 0xf3f300f3, 0xd7d700d7, 0xfbfb00fb,
+      0x7c7c007c, 0xe3e300e3, 0x39390039, 0x82820082,
+      0x9b9b009b, 0x2f2f002f, 0xffff00ff, 0x87870087,
+      0x34340034, 0x8e8e008e, 0x43430043, 0x44440044,
+      0xc4c400c4, 0xdede00de, 0xe9e900e9, 0xcbcb00cb,
+      0x54540054, 0x7b7b007b, 0x94940094, 0x32320032,
+      0xa6a600a6, 0xc2c200c2, 0x23230023, 0x3d3d003d,
+      0xeeee00ee, 0x4c4c004c, 0x95950095, 0x0b0b000b,
+      0x42420042, 0xfafa00fa, 0xc3c300c3, 0x4e4e004e,
+      0x08080008, 0x2e2e002e, 0xa1a100a1, 0x66660066,
+      0x28280028, 0xd9d900d9, 0x24240024, 0xb2b200b2,
+      0x76760076, 0x5b5b005b, 0xa2a200a2, 0x49490049,
+      0x6d6d006d, 0x8b8b008b, 0xd1d100d1, 0x25250025,
+      0x72720072, 0xf8f800f8, 0xf6f600f6, 0x64640064,
+      0x86860086, 0x68680068, 0x98980098, 0x16160016,
+      0xd4d400d4, 0xa4a400a4, 0x5c5c005c, 0xcccc00cc,
+      0x5d5d005d, 0x65650065, 0xb6b600b6, 0x92920092,
+      0x6c6c006c, 0x70700070, 0x48480048, 0x50500050,
+      0xfdfd00fd, 0xeded00ed, 0xb9b900b9, 0xdada00da,
+      0x5e5e005e, 0x15150015, 0x46460046, 0x57570057,
+      0xa7a700a7, 0x8d8d008d, 0x9d9d009d, 0x84840084,
+      0x90900090, 0xd8d800d8, 0xabab00ab, 0x00000000,
+      0x8c8c008c, 0xbcbc00bc, 0xd3d300d3, 0x0a0a000a,
+      0xf7f700f7, 0xe4e400e4, 0x58580058, 0x05050005,
+      0xb8b800b8, 0xb3b300b3, 0x45450045, 0x06060006,
+      0xd0d000d0, 0x2c2c002c, 0x1e1e001e, 0x8f8f008f,
+      0xcaca00ca, 0x3f3f003f, 0x0f0f000f, 0x02020002,
+      0xc1c100c1, 0xafaf00af, 0xbdbd00bd, 0x03030003,
+      0x01010001, 0x13130013, 0x8a8a008a, 0x6b6b006b,
+      0x3a3a003a, 0x91910091, 0x11110011, 0x41410041,
+      0x4f4f004f, 0x67670067, 0xdcdc00dc, 0xeaea00ea,
+      0x97970097, 0xf2f200f2, 0xcfcf00cf, 0xcece00ce,
+      0xf0f000f0, 0xb4b400b4, 0xe6e600e6, 0x73730073,
+      0x96960096, 0xacac00ac, 0x74740074, 0x22220022,
+      0xe7e700e7, 0xadad00ad, 0x35350035, 0x85850085,
+      0xe2e200e2, 0xf9f900f9, 0x37370037, 0xe8e800e8,
+      0x1c1c001c, 0x75750075, 0xdfdf00df, 0x6e6e006e,
+      0x47470047, 0xf1f100f1, 0x1a1a001a, 0x71710071,
+      0x1d1d001d, 0x29290029, 0xc5c500c5, 0x89890089,
+      0x6f6f006f, 0xb7b700b7, 0x62620062, 0x0e0e000e,
+      0xaaaa00aa, 0x18180018, 0xbebe00be, 0x1b1b001b,
+      0xfcfc00fc, 0x56560056, 0x3e3e003e, 0x4b4b004b,
+      0xc6c600c6, 0xd2d200d2, 0x79790079, 0x20200020,
+      0x9a9a009a, 0xdbdb00db, 0xc0c000c0, 0xfefe00fe,
+      0x78780078, 0xcdcd00cd, 0x5a5a005a, 0xf4f400f4,
+      0x1f1f001f, 0xdddd00dd, 0xa8a800a8, 0x33330033,
+      0x88880088, 0x07070007, 0xc7c700c7, 0x31310031,
+      0xb1b100b1, 0x12120012, 0x10100010, 0x59590059,
+      0x27270027, 0x80800080, 0xecec00ec, 0x5f5f005f,
+      0x60600060, 0x51510051, 0x7f7f007f, 0xa9a900a9,
+      0x19190019, 0xb5b500b5, 0x4a4a004a, 0x0d0d000d,
+      0x2d2d002d, 0xe5e500e5, 0x7a7a007a, 0x9f9f009f,
+      0x93930093, 0xc9c900c9, 0x9c9c009c, 0xefef00ef,
+      0xa0a000a0, 0xe0e000e0, 0x3b3b003b, 0x4d4d004d,
+      0xaeae00ae, 0x2a2a002a, 0xf5f500f5, 0xb0b000b0,
+      0xc8c800c8, 0xebeb00eb, 0xbbbb00bb, 0x3c3c003c,
+      0x83830083, 0x53530053, 0x99990099, 0x61610061,
+      0x17170017, 0x2b2b002b, 0x04040004, 0x7e7e007e,
+      0xbaba00ba, 0x77770077, 0xd6d600d6, 0x26260026,
+      0xe1e100e1, 0x69690069, 0x14140014, 0x63630063,
+      0x55550055, 0x21210021, 0x0c0c000c, 0x7d7d007d
+    },
+    { /* x2 */
+      0x30303000, 0x68686800, 0x99999900, 0x1b1b1b00,
+      0x87878700, 0xb9b9b900, 0x21212100, 0x78787800,
+      0x50505000, 0x39393900, 0xdbdbdb00, 0xe1e1e100,
+      0x72727200, 0x09090900, 0x62626200, 0x3c3c3c00,
+      0x3e3e3e00, 0x7e7e7e00, 0x5e5e5e00, 0x8e8e8e00,
+      0xf1f1f100, 0xa0a0a000, 0xcccccc00, 0xa3a3a300,
+      0x2a2a2a00, 0x1d1d1d00, 0xfbfbfb00, 0xb6b6b600,
+      0xd6d6d600, 0x20202000, 0xc4c4c400, 0x8d8d8d00,
+      0x81818100, 0x65656500, 0xf5f5f500, 0x89898900,
+      0xcbcbcb00, 0x9d9d9d00, 0x77777700, 0xc6c6c600,
+      0x57575700, 0x43434300, 0x56565600, 0x17171700,
+      0xd4d4d400, 0x40404000, 0x1a1a1a00, 0x4d4d4d00,
+      0xc0c0c000, 0x63636300, 0x6c6c6c00, 0xe3e3e300,
+      0xb7b7b700, 0xc8c8c800, 0x64646400, 0x6a6a6a00,
+      0x53535300, 0xaaaaaa00, 0x38383800, 0x98989800,
+      0x0c0c0c00, 0xf4f4f400, 0x9b9b9b00, 0xededed00,
+      0x7f7f7f00, 0x22222200, 0x76767600, 0xafafaf00,
+      0xdddddd00, 0x3a3a3a00, 0x0b0b0b00, 0x58585800,
+      0x67676700, 0x88888800, 0x06060600, 0xc3c3c300,
+      0x35353500, 0x0d0d0d00, 0x01010100, 0x8b8b8b00,
+      0x8c8c8c00, 0xc2c2c200, 0xe6e6e600, 0x5f5f5f00,
+      0x02020200, 0x24242400, 0x75757500, 0x93939300,
+      0x66666600, 0x1e1e1e00, 0xe5e5e500, 0xe2e2e200,
+      0x54545400, 0xd8d8d800, 0x10101000, 0xcecece00,
+      0x7a7a7a00, 0xe8e8e800, 0x08080800, 0x2c2c2c00,
+      0x12121200, 0x97979700, 0x32323200, 0xababab00,
+      0xb4b4b400, 0x27272700, 0x0a0a0a00, 0x23232300,
+      0xdfdfdf00, 0xefefef00, 0xcacaca00, 0xd9d9d900,
+      0xb8b8b800, 0xfafafa00, 0xdcdcdc00, 0x31313100,
+      0x6b6b6b00, 0xd1d1d100, 0xadadad00, 0x19191900,
+      0x49494900, 0xbdbdbd00, 0x51515100, 0x96969600,
+      0xeeeeee00, 0xe4e4e400, 0xa8a8a800, 0x41414100,
+      0xdadada00, 0xffffff00, 0xcdcdcd00, 0x55555500,
+      0x86868600, 0x36363600, 0xbebebe00, 0x61616100,
+      0x52525200, 0xf8f8f800, 0xbbbbbb00, 0x0e0e0e00,
+      0x82828200, 0x48484800, 0x69696900, 0x9a9a9a00,
+      0xe0e0e000, 0x47474700, 0x9e9e9e00, 0x5c5c5c00,
+      0x04040400, 0x4b4b4b00, 0x34343400, 0x15151500,
+      0x79797900, 0x26262600, 0xa7a7a700, 0xdedede00,
+      0x29292900, 0xaeaeae00, 0x92929200, 0xd7d7d700,
+      0x84848400, 0xe9e9e900, 0xd2d2d200, 0xbababa00,
+      0x5d5d5d00, 0xf3f3f300, 0xc5c5c500, 0xb0b0b000,
+      0xbfbfbf00, 0xa4a4a400, 0x3b3b3b00, 0x71717100,
+      0x44444400, 0x46464600, 0x2b2b2b00, 0xfcfcfc00,
+      0xebebeb00, 0x6f6f6f00, 0xd5d5d500, 0xf6f6f600,
+      0x14141400, 0xfefefe00, 0x7c7c7c00, 0x70707000,
+      0x5a5a5a00, 0x7d7d7d00, 0xfdfdfd00, 0x2f2f2f00,
+      0x18181800, 0x83838300, 0x16161600, 0xa5a5a500,
+      0x91919100, 0x1f1f1f00, 0x05050500, 0x95959500,
+      0x74747400, 0xa9a9a900, 0xc1c1c100, 0x5b5b5b00,
+      0x4a4a4a00, 0x85858500, 0x6d6d6d00, 0x13131300,
+      0x07070700, 0x4f4f4f00, 0x4e4e4e00, 0x45454500,
+      0xb2b2b200, 0x0f0f0f00, 0xc9c9c900, 0x1c1c1c00,
+      0xa6a6a600, 0xbcbcbc00, 0xececec00, 0x73737300,
+      0x90909000, 0x7b7b7b00, 0xcfcfcf00, 0x59595900,
+      0x8f8f8f00, 0xa1a1a100, 0xf9f9f900, 0x2d2d2d00,
+      0xf2f2f200, 0xb1b1b100, 0x00000000, 0x94949400,
+      0x37373700, 0x9f9f9f00, 0xd0d0d000, 0x2e2e2e00,
+      0x9c9c9c00, 0x6e6e6e00, 0x28282800, 0x3f3f3f00,
+      0x80808000, 0xf0f0f000, 0x3d3d3d00, 0xd3d3d300,
+      0x25252500, 0x8a8a8a00, 0xb5b5b500, 0xe7e7e700,
+      0x42424200, 0xb3b3b300, 0xc7c7c700, 0xeaeaea00,
+      0xf7f7f700, 0x4c4c4c00, 0x11111100, 0x33333300,
+      0x03030300, 0xa2a2a200, 0xacacac00, 0x60606000
+    },
+    0
+  };
+
+/* Prefetching for sbox tables. */
+static inline void
+prefetch_table(const volatile byte *tab, size_t len)
+{
+  size_t i;
+
+  for (i = 0; len - i >= 8 * 32; i += 8 * 32)
+    {
+      (void)tab[i + 0 * 32];
+      (void)tab[i + 1 * 32];
+      (void)tab[i + 2 * 32];
+      (void)tab[i + 3 * 32];
+      (void)tab[i + 4 * 32];
+      (void)tab[i + 5 * 32];
+      (void)tab[i + 6 * 32];
+      (void)tab[i + 7 * 32];
+    }
+  for (; i < len; i += 32)
+    {
+      (void)tab[i];
+    }
+
+  (void)tab[len - 1];
+}
+
+static inline void
+prefetch_sboxes(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.  */
+  sboxes.counter_head++;
+  sboxes.counter_tail++;
+
+  /* Prefetch look-up tables to cache.  */
+  prefetch_table((const void *)&sboxes, sizeof(sboxes));
+}
+
+
+static ALWAYS_INLINE
+u32 rotr32(u32 v, u32 r)
+{
+  return ror(v, r);
+}
+
+static ALWAYS_INLINE
+u32 bswap32(u32 v)
+{
+  return _gcry_bswap32(v);
+}
+
+static ALWAYS_INLINE u32
+get_u8(u32 x, u32 y)
+{
+  return (x >> ((3 - y) * 8)) & 0xFF;
+}
+
+static ALWAYS_INLINE u32
+make_u32(byte v0, byte v1, byte v2, byte v3)
+{
+  return ((u32)v0 << 24) | ((u32)v1 << 16) | ((u32)v2 <<  8) | ((u32)v3);
+}
+
+static ALWAYS_INLINE u32
+aria_m(u32 t0)
+{
+  return rotr32(t0, 8) ^ rotr32(t0 ^ rotr32(t0, 8), 16);
+}
+
+/* S-Box Layer 1 + M */
+static ALWAYS_INLINE void
+aria_sbox_layer1_with_pre_diff(u32 *t0, u32 *t1, u32 *t2, u32 *t3)
+{
+  *t0 = sboxes.s1[get_u8(*t0, 0)] ^
+	sboxes.s2[get_u8(*t0, 1)] ^
+	sboxes.x1[get_u8(*t0, 2)] ^
+	sboxes.x2[get_u8(*t0, 3)];
+  *t1 = sboxes.s1[get_u8(*t1, 0)] ^
+	sboxes.s2[get_u8(*t1, 1)] ^
+	sboxes.x1[get_u8(*t1, 2)] ^
+	sboxes.x2[get_u8(*t1, 3)];
+  *t2 = sboxes.s1[get_u8(*t2, 0)] ^
+	sboxes.s2[get_u8(*t2, 1)] ^
+	sboxes.x1[get_u8(*t2, 2)] ^
+	sboxes.x2[get_u8(*t2, 3)];
+  *t3 = sboxes.s1[get_u8(*t3, 0)] ^
+	sboxes.s2[get_u8(*t3, 1)] ^
+	sboxes.x1[get_u8(*t3, 2)] ^
+	sboxes.x2[get_u8(*t3, 3)];
+}
+
+/* S-Box Layer 2 + M */
+static ALWAYS_INLINE void
+aria_sbox_layer2_with_pre_diff(u32 *t0, u32 *t1, u32 *t2, u32 *t3)
+{
+  *t0 = sboxes.x1[get_u8(*t0, 0)] ^
+	sboxes.x2[get_u8(*t0, 1)] ^
+	sboxes.s1[get_u8(*t0, 2)] ^
+	sboxes.s2[get_u8(*t0, 3)];
+  *t1 = sboxes.x1[get_u8(*t1, 0)] ^
+	sboxes.x2[get_u8(*t1, 1)] ^
+	sboxes.s1[get_u8(*t1, 2)] ^
+	sboxes.s2[get_u8(*t1, 3)];
+  *t2 = sboxes.x1[get_u8(*t2, 0)] ^
+	sboxes.x2[get_u8(*t2, 1)] ^
+	sboxes.s1[get_u8(*t2, 2)] ^
+	sboxes.s2[get_u8(*t2, 3)];
+  *t3 = sboxes.x1[get_u8(*t3, 0)] ^
+	sboxes.x2[get_u8(*t3, 1)] ^
+	sboxes.s1[get_u8(*t3, 2)] ^
+	sboxes.s2[get_u8(*t3, 3)];
+}
+
+/* Word-level diffusion */
+static ALWAYS_INLINE void
+aria_diff_word(u32 *t0, u32 *t1, u32 *t2, u32 *t3)
+{
+  *t1 ^= *t2;
+  *t2 ^= *t3;
+  *t0 ^= *t1;
+
+  *t3 ^= *t1;
+  *t2 ^= *t0;
+  *t1 ^= *t2;
+}
+
+/* Byte-level diffusion */
+static inline void aria_diff_byte(u32 *t1, u32 *t2, u32 *t3)
+{
+  *t1 = ((*t1 << 8) & 0xff00ff00) ^ ((*t1 >> 8) & 0x00ff00ff);
+  *t2 = rotr32(*t2, 16);
+  *t3 = bswap32(*t3);
+}
+
+/* Key XOR Layer */
+static ALWAYS_INLINE void
+aria_add_round_key(u32 *rk, u32 *t0, u32 *t1, u32 *t2, u32 *t3)
+{
+  *t0 ^= rk[0];
+  *t1 ^= rk[1];
+  *t2 ^= rk[2];
+  *t3 ^= rk[3];
+}
+/* Odd round Substitution & Diffusion */
+static ALWAYS_INLINE void
+aria_subst_diff_odd(u32 *t0, u32 *t1, u32 *t2, u32 *t3)
+{
+  aria_sbox_layer1_with_pre_diff(t0, t1, t2, t3);
+  aria_diff_word(t0, t1, t2, t3);
+  aria_diff_byte(t1, t2, t3);
+  aria_diff_word(t0, t1, t2, t3);
+}
+
+/* Even round Substitution & Diffusion */
+static ALWAYS_INLINE void
+aria_subst_diff_even(u32 *t0, u32 *t1, u32 *t2, u32 *t3)
+{
+  aria_sbox_layer2_with_pre_diff(t0, t1, t2, t3);
+  aria_diff_word(t0, t1, t2, t3);
+  aria_diff_byte(t3, t0, t1);
+  aria_diff_word(t0, t1, t2, t3);
+}
+
+/* Last round */
+static ALWAYS_INLINE void
+aria_last_round(u32 *t0, u32 *t1, u32 *t2, u32 *t3)
+{
+  *t0 = make_u32((byte)(sboxes.x1[get_u8(*t0, 0)]),
+		 (byte)(sboxes.x2[get_u8(*t0, 1)] >> 24),
+		 (byte)(sboxes.s1[get_u8(*t0, 2)]),
+		 (byte)(sboxes.s2[get_u8(*t0, 3)]));
+  *t1 = make_u32((byte)(sboxes.x1[get_u8(*t1, 0)]),
+		 (byte)(sboxes.x2[get_u8(*t1, 1)] >> 24),
+		 (byte)(sboxes.s1[get_u8(*t1, 2)]),
+		 (byte)(sboxes.s2[get_u8(*t1, 3)]));
+  *t2 = make_u32((byte)(sboxes.x1[get_u8(*t2, 0)]),
+		 (byte)(sboxes.x2[get_u8(*t2, 1)] >> 24),
+		 (byte)(sboxes.s1[get_u8(*t2, 2)]),
+		 (byte)(sboxes.s2[get_u8(*t2, 3)]));
+  *t3 = make_u32((byte)(sboxes.x1[get_u8(*t3, 0)]),
+		 (byte)(sboxes.x2[get_u8(*t3, 1)] >> 24),
+		 (byte)(sboxes.s1[get_u8(*t3, 2)]),
+		 (byte)(sboxes.s2[get_u8(*t3, 3)]));
+}
+
+/* Q, R Macro expanded ARIA GSRK */
+static ALWAYS_INLINE void
+aria_gsrk(u32 *rk, u32 *x, u32 *y, u32 n)
+{
+  int q = 4 - (n / 32);
+  int r = n % 32;
+
+  rk[0] = (x[0]) ^
+	  ((y[q % 4]) >> r) ^
+	  ((y[(q + 3) % 4]) << (32 - r));
+  rk[1] = (x[1]) ^
+	  ((y[(q + 1) % 4]) >> r) ^
+	  ((y[q % 4]) << (32 - r));
+  rk[2] = (x[2]) ^
+	  ((y[(q + 2) % 4]) >> r) ^
+	  ((y[(q + 1) % 4]) << (32 - r));
+  rk[3] = (x[3]) ^
+	  ((y[(q + 3) % 4]) >> r) ^
+	  ((y[(q + 2) % 4]) << (32 - r));
+}
+
+
+static NO_INLINE void
+aria_set_encrypt_key(ARIA_context *ctx, const byte *in_key, u32 key_len)
+{
+  u32 w0[4], w1[4], w2[4], w3[4];
+  u32 reg0, reg1, reg2, reg3;
+  const u32 *ck;
+  int rkidx = 0;
+
+  ctx->rounds = (key_len + 32) / 4;
+  prefetch_sboxes();
+
+  ck = &key_rc[(key_len - 16) / 2];
+
+  w0[0] = buf_get_be32(in_key + 0);
+  w0[1] = buf_get_be32(in_key + 4);
+  w0[2] = buf_get_be32(in_key + 8);
+  w0[3] = buf_get_be32(in_key + 12);
+
+  reg0 = w0[0] ^ ck[0];
+  reg1 = w0[1] ^ ck[1];
+  reg2 = w0[2] ^ ck[2];
+  reg3 = w0[3] ^ ck[3];
+
+  aria_subst_diff_odd(&reg0, &reg1, &reg2, &reg3);
+
+  if (key_len > 16)
+    {
+      w1[0] = buf_get_be32(in_key + 16);
+      w1[1] = buf_get_be32(in_key + 20);
+      if (key_len > 24)
+	{
+	  w1[2] = buf_get_be32(in_key + 24);
+	  w1[3] = buf_get_be32(in_key + 28);
+	}
+      else
+	{
+	  w1[2] = 0;
+	  w1[3] = 0;
+	}
+    }
+  else
+    {
+      w1[0] = 0;
+      w1[1] = 0;
+      w1[2] = 0;
+      w1[3] = 0;
+    }
+
+  w1[0] ^= reg0;
+  w1[1] ^= reg1;
+  w1[2] ^= reg2;
+  w1[3] ^= reg3;
+
+  reg0 = w1[0];
+  reg1 = w1[1];
+  reg2 = w1[2];
+  reg3 = w1[3];
+
+  reg0 ^= ck[4];
+  reg1 ^= ck[5];
+  reg2 ^= ck[6];
+  reg3 ^= ck[7];
+
+  aria_subst_diff_even(&reg0, &reg1, &reg2, &reg3);
+
+  reg0 ^= w0[0];
+  reg1 ^= w0[1];
+  reg2 ^= w0[2];
+  reg3 ^= w0[3];
+
+  w2[0] = reg0;
+  w2[1] = reg1;
+  w2[2] = reg2;
+  w2[3] = reg3;
+
+  reg0 ^= ck[8];
+  reg1 ^= ck[9];
+  reg2 ^= ck[10];
+  reg3 ^= ck[11];
+
+  aria_subst_diff_odd(&reg0, &reg1, &reg2, &reg3);
+
+  w3[0] = reg0 ^ w1[0];
+  w3[1] = reg1 ^ w1[1];
+  w3[2] = reg2 ^ w1[2];
+  w3[3] = reg3 ^ w1[3];
+
+  aria_gsrk(ctx->enc_key[rkidx], w0, w1, 19);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w1, w2, 19);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w2, w3, 19);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w3, w0, 19);
+
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w0, w1, 31);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w1, w2, 31);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w2, w3, 31);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w3, w0, 31);
+
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w0, w1, 67);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w1, w2, 67);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w2, w3, 67);
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w3, w0, 67);
+
+  rkidx++;
+  aria_gsrk(ctx->enc_key[rkidx], w0, w1, 97);
+  if (key_len > 16)
+    {
+      rkidx++;
+      aria_gsrk(ctx->enc_key[rkidx], w1, w2, 97);
+      rkidx++;
+      aria_gsrk(ctx->enc_key[rkidx], w2, w3, 97);
+
+      if (key_len > 24)
+	{
+	  rkidx++;
+	  aria_gsrk(ctx->enc_key[rkidx], w3, w0, 97);
+
+	  rkidx++;
+	  aria_gsrk(ctx->enc_key[rkidx], w0, w1, 109);
+	}
+    }
+
+  wipememory(w0, sizeof(w0));
+  wipememory(w1, sizeof(w1));
+  wipememory(w2, sizeof(w2));
+  wipememory(w3, sizeof(w3));
+}
+
+static void
+aria_set_decrypt_key(ARIA_context *ctx)
+{
+  int i;
+
+  for (i = 0; i < 4; i++)
+    {
+      ctx->dec_key[0][i] = ctx->enc_key[ctx->rounds][i];
+      ctx->dec_key[ctx->rounds][i] = ctx->enc_key[0][i];
+    }
+
+  for (i = 1; i < ctx->rounds; i++)
+    {
+      ctx->dec_key[i][0] = aria_m(ctx->enc_key[ctx->rounds - i][0]);
+      ctx->dec_key[i][1] = aria_m(ctx->enc_key[ctx->rounds - i][1]);
+      ctx->dec_key[i][2] = aria_m(ctx->enc_key[ctx->rounds - i][2]);
+      ctx->dec_key[i][3] = aria_m(ctx->enc_key[ctx->rounds - i][3]);
+
+      aria_diff_word(&ctx->dec_key[i][0], &ctx->dec_key[i][1],
+		     &ctx->dec_key[i][2], &ctx->dec_key[i][3]);
+      aria_diff_byte(&ctx->dec_key[i][1],
+		     &ctx->dec_key[i][2], &ctx->dec_key[i][3]);
+      aria_diff_word(&ctx->dec_key[i][0], &ctx->dec_key[i][1],
+		     &ctx->dec_key[i][2], &ctx->dec_key[i][3]);
+    }
+}
+
+static NO_INLINE unsigned int
+aria_crypt(ARIA_context *ctx, byte *out, const byte *in,
+	   u32 key[][ARIA_RD_KEY_WORDS])
+{
+  u32 reg0, reg1, reg2, reg3;
+  int rounds = ctx->rounds;
+  int rkidx = 0;
+
+  reg0 = buf_get_be32(in + 0);
+  reg1 = buf_get_be32(in + 4);
+  reg2 = buf_get_be32(in + 8);
+  reg3 = buf_get_be32(in + 12);
+
+  aria_add_round_key(key[rkidx], &reg0, &reg1, &reg2, &reg3);
+  rkidx++;
+
+  while (1)
+    {
+      aria_subst_diff_odd(&reg0, &reg1, &reg2, &reg3);
+      aria_add_round_key(key[rkidx], &reg0, &reg1, &reg2, &reg3);
+      rkidx++;
+
+      if (rkidx >= rounds)
+	break;
+
+      aria_subst_diff_even(&reg0, &reg1, &reg2, &reg3);
+      aria_add_round_key(key[rkidx], &reg0, &reg1, &reg2, &reg3);
+      rkidx++;
+    }
+
+  aria_last_round(&reg0, &reg1, &reg2, &reg3);
+  aria_add_round_key(key[rkidx], &reg0, &reg1, &reg2, &reg3);
+
+  buf_put_be32(out + 0, reg0);
+  buf_put_be32(out + 4, reg1);
+  buf_put_be32(out + 8, reg2);
+  buf_put_be32(out + 12, reg3);
+
+  return 4 * sizeof(void *) + 4 * sizeof(u32); /* stack burn depth */
+}
+
+unsigned int
+aria_encrypt(void *c, byte *outbuf, const byte *inbuf)
+{
+  ARIA_context *ctx = (ARIA_context *)c;
+
+  prefetch_sboxes ();
+
+  return aria_crypt (ctx, outbuf, inbuf, ctx->enc_key);
+}
+
+unsigned int
+aria_decrypt(void *c, byte *outbuf, const byte *inbuf)
+{
+  ARIA_context *ctx = (ARIA_context *)c;
+
+  if (!ctx->decryption_prepared)
+    {
+      aria_set_decrypt_key (ctx);
+      ctx->decryption_prepared = 1;
+    }
+
+  prefetch_sboxes ();
+
+  return aria_crypt (ctx, outbuf, inbuf, ctx->dec_key);
+}
+
+
+static gcry_err_code_t
+aria_setkey(void *c, const byte *key, unsigned keylen,
+	    cipher_bulk_ops_t *bulk_ops)
+{
+  ARIA_context *ctx = c;
+  static int initialized = 0;
+  static const char *selftest_failed = NULL;
+
+  if (keylen != 16 && keylen != 24 && keylen != 32)
+    return GPG_ERR_INV_KEYLEN;
+
+  if (!initialized)
+    {
+      initialized = 1;
+      selftest_failed = aria_selftest ();
+      if (selftest_failed)
+	log_error("%s\n", selftest_failed);
+    }
+
+  if (selftest_failed)
+    return GPG_ERR_SELFTEST_FAILED;
+
+  /* Setup bulk encryption routines.  */
+  memset (bulk_ops, 0, sizeof(*bulk_ops));
+
+  /* Setup context and encryption key. */
+  ctx->decryption_prepared = 0;
+  aria_set_encrypt_key (ctx, key, keylen);
+
+  _gcry_burn_stack (3 * sizeof(void *) + 5 * 4 * sizeof(u32));
+  return 0;
+}
+
+
+static const char *
+aria_selftest (void)
+{
+  ARIA_context ctx;
+  byte scratch[16];
+
+  static const byte key[16] = {
+    0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+    0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
+  };
+  static const byte plaintext[16] = {
+    0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+    0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
+  };
+  static const byte ciphertext[16] = {
+    0xd7, 0x18, 0xfb, 0xd6, 0xab, 0x64, 0x4c, 0x73,
+    0x9d, 0xa9, 0x5f, 0x3b, 0xe6, 0x45, 0x17, 0x78
+  };
+
+  memset (&ctx, 0, sizeof(ctx));
+
+  aria_set_encrypt_key (&ctx, key, 16);
+  aria_encrypt (&ctx, scratch, plaintext);
+  if (memcmp (scratch, ciphertext, sizeof (ciphertext)))
+    return "ARIA test encryption failed.";
+  aria_decrypt (&ctx, scratch, scratch);
+  if (memcmp (scratch, plaintext, sizeof (plaintext)))
+    return "ARIA test decryption failed.";
+
+  return NULL;
+}
+
+
+static const gcry_cipher_oid_spec_t aria128_oids[] =
+  {
+    { "1.2.410.200046.1.1.1", GCRY_CIPHER_MODE_ECB },
+    { "1.2.410.200046.1.1.2", GCRY_CIPHER_MODE_CBC },
+    { "1.2.410.200046.1.1.3", GCRY_CIPHER_MODE_CFB },
+    { "1.2.410.200046.1.1.4", GCRY_CIPHER_MODE_OFB },
+    { "1.2.410.200046.1.1.5", GCRY_CIPHER_MODE_CTR },
+    { "1.2.410.200046.1.1.34", GCRY_CIPHER_MODE_GCM },
+    { "1.2.410.200046.1.1.37", GCRY_CIPHER_MODE_CCM },
+    { NULL }
+  };
+
+static const gcry_cipher_oid_spec_t aria192_oids[] =
+  {
+    { "1.2.410.200046.1.1.6", GCRY_CIPHER_MODE_ECB },
+    { "1.2.410.200046.1.1.7", GCRY_CIPHER_MODE_CBC },
+    { "1.2.410.200046.1.1.8", GCRY_CIPHER_MODE_CFB },
+    { "1.2.410.200046.1.1.9", GCRY_CIPHER_MODE_OFB },
+    { "1.2.410.200046.1.1.10", GCRY_CIPHER_MODE_CTR },
+    { "1.2.410.200046.1.1.35", GCRY_CIPHER_MODE_GCM },
+    { "1.2.410.200046.1.1.38", GCRY_CIPHER_MODE_CCM },
+    { NULL }
+  };
+
+static const gcry_cipher_oid_spec_t aria256_oids[] =
+  {
+    { "1.2.410.200046.1.1.11", GCRY_CIPHER_MODE_ECB },
+    { "1.2.410.200046.1.1.12", GCRY_CIPHER_MODE_CBC },
+    { "1.2.410.200046.1.1.13", GCRY_CIPHER_MODE_CFB },
+    { "1.2.410.200046.1.1.14", GCRY_CIPHER_MODE_OFB },
+    { "1.2.410.200046.1.1.15", GCRY_CIPHER_MODE_CTR },
+    { "1.2.410.200046.1.1.36", GCRY_CIPHER_MODE_GCM },
+    { "1.2.410.200046.1.1.39", GCRY_CIPHER_MODE_CCM },
+    { NULL }
+  };
+
+gcry_cipher_spec_t _gcry_cipher_spec_aria128 =
+  {
+    GCRY_CIPHER_ARIA128, { 0, 0 },
+    "ARIA128", NULL, aria128_oids, ARIA_BLOCK_SIZE, 128,
+    sizeof(ARIA_context), aria_setkey, aria_encrypt, aria_decrypt
+  };
+
+gcry_cipher_spec_t _gcry_cipher_spec_aria192 =
+  {
+    GCRY_CIPHER_ARIA192, { 0, 0 },
+    "ARIA192",NULL,aria192_oids, ARIA_BLOCK_SIZE, 192,
+    sizeof(ARIA_context), aria_setkey, aria_encrypt, aria_decrypt
+  };
+
+gcry_cipher_spec_t _gcry_cipher_spec_aria256 =
+  {
+    GCRY_CIPHER_ARIA256, { 0, 0 },
+    "ARIA256", NULL, aria256_oids, ARIA_BLOCK_SIZE, 256,
+    sizeof(ARIA_context), aria_setkey, aria_encrypt, aria_decrypt
+  };
diff --git a/cipher/cipher.c b/cipher/cipher.c
index 6f92b75a..f2558371 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -90,6 +90,11 @@ static gcry_cipher_spec_t * const cipher_list[] =
 #endif
 #if USE_SM4
      &_gcry_cipher_spec_sm4,
+#endif
+#if USE_ARIA
+     &_gcry_cipher_spec_aria128,
+     &_gcry_cipher_spec_aria192,
+     &_gcry_cipher_spec_aria256,
 #endif
      NULL
   };
@@ -207,8 +212,17 @@ static gcry_cipher_spec_t * const cipher_list_algo301[] =
     NULL,
 #endif
 #if USE_SM4
-     &_gcry_cipher_spec_sm4
+    &_gcry_cipher_spec_sm4,
+#else
+    NULL,
+#endif
+#if USE_ARIA
+    &_gcry_cipher_spec_aria128,
+    &_gcry_cipher_spec_aria192,
+    &_gcry_cipher_spec_aria256
 #else
+    NULL,
+    NULL,
     NULL
 #endif
   };
diff --git a/cipher/mac-cmac.c b/cipher/mac-cmac.c
index b80c3406..5b1974ed 100644
--- a/cipher/mac-cmac.c
+++ b/cipher/mac-cmac.c
@@ -60,6 +60,8 @@ map_mac_algo_to_cipher (int mac_algo)
       return GCRY_CIPHER_GOST28147;
     case GCRY_MAC_CMAC_SM4:
       return GCRY_CIPHER_SM4;
+    case GCRY_MAC_CMAC_ARIA:
+      return GCRY_CIPHER_ARIA128;
     }
 }
 
@@ -522,3 +524,9 @@ const gcry_mac_spec_t _gcry_mac_type_spec_cmac_sm4 = {
   &cmac_ops
 };
 #endif
+#if USE_ARIA
+const gcry_mac_spec_t _gcry_mac_type_spec_cmac_aria = {
+  GCRY_MAC_CMAC_ARIA, {0, 0}, "CMAC_ARIA",
+  &cmac_ops
+};
+#endif
diff --git a/cipher/mac-gmac.c b/cipher/mac-gmac.c
index 5e350010..20edaf91 100644
--- a/cipher/mac-gmac.c
+++ b/cipher/mac-gmac.c
@@ -47,6 +47,8 @@ map_mac_algo_to_cipher (int mac_algo)
       return GCRY_CIPHER_SEED;
     case GCRY_MAC_GMAC_SM4:
       return GCRY_CIPHER_SM4;
+    case GCRY_MAC_GMAC_ARIA:
+      return GCRY_CIPHER_ARIA128;
     }
 }
 
@@ -193,3 +195,9 @@ const gcry_mac_spec_t _gcry_mac_type_spec_gmac_sm4 = {
   &gmac_ops
 };
 #endif
+#if USE_ARIA
+const gcry_mac_spec_t _gcry_mac_type_spec_gmac_aria = {
+  GCRY_MAC_GMAC_ARIA, {0, 0}, "GMAC_ARIA",
+  &gmac_ops
+};
+#endif
diff --git a/cipher/mac-internal.h b/cipher/mac-internal.h
index 39876f55..142ef69e 100644
--- a/cipher/mac-internal.h
+++ b/cipher/mac-internal.h
@@ -234,6 +234,9 @@ extern const gcry_mac_spec_t _gcry_mac_type_spec_gost28147_imit;
 #if USE_SM4
 extern const gcry_mac_spec_t _gcry_mac_type_spec_cmac_sm4;
 #endif
+#if USE_ARIA
+extern const gcry_mac_spec_t _gcry_mac_type_spec_cmac_aria;
+#endif
 
 /*
  * The GMAC algorithm specifications (mac-gmac.c).
@@ -256,6 +259,9 @@ extern const gcry_mac_spec_t _gcry_mac_type_spec_gmac_camellia;
 #if USE_SM4
 extern const gcry_mac_spec_t _gcry_mac_type_spec_gmac_sm4;
 #endif
+#if USE_ARIA
+extern const gcry_mac_spec_t _gcry_mac_type_spec_gmac_aria;
+#endif
 
 /*
  * The Poly1305 MAC algorithm specifications (mac-poly1305.c).
@@ -279,3 +285,6 @@ extern const gcry_mac_spec_t _gcry_mac_type_spec_poly1305mac_seed;
 #if USE_SM4
 extern const gcry_mac_spec_t _gcry_mac_type_spec_poly1305mac_sm4;
 #endif
+#if USE_ARIA
+extern const gcry_mac_spec_t _gcry_mac_type_spec_poly1305mac_aria;
+#endif
diff --git a/cipher/mac-poly1305.c b/cipher/mac-poly1305.c
index 5b6c489e..197468f2 100644
--- a/cipher/mac-poly1305.c
+++ b/cipher/mac-poly1305.c
@@ -86,6 +86,9 @@ poly1305mac_open (gcry_mac_hd_t h)
     case GCRY_MAC_POLY1305_SM4:
       cipher_algo = GCRY_CIPHER_SM4;
       break;
+    case GCRY_MAC_POLY1305_ARIA:
+      cipher_algo = GCRY_CIPHER_ARIA128;
+      break;
     }
 
   err = _gcry_cipher_open_internal (&mac_ctx->hd, cipher_algo,
@@ -371,3 +374,9 @@ const gcry_mac_spec_t _gcry_mac_type_spec_poly1305mac_sm4 = {
   &poly1305mac_ops
 };
 #endif
+#if USE_ARIA
+const gcry_mac_spec_t _gcry_mac_type_spec_poly1305mac_aria = {
+  GCRY_MAC_POLY1305_ARIA, {0, 0}, "POLY1305_ARIA",
+  &poly1305mac_ops
+};
+#endif
diff --git a/cipher/mac.c b/cipher/mac.c
index 05d2c64c..6305f51e 100644
--- a/cipher/mac.c
+++ b/cipher/mac.c
@@ -134,6 +134,11 @@ static const gcry_mac_spec_t * const mac_list[] = {
   &_gcry_mac_type_spec_cmac_sm4,
   &_gcry_mac_type_spec_gmac_sm4,
   &_gcry_mac_type_spec_poly1305mac_sm4,
+#endif
+#if USE_ARIA
+  &_gcry_mac_type_spec_cmac_aria,
+  &_gcry_mac_type_spec_gmac_aria,
+  &_gcry_mac_type_spec_poly1305mac_aria,
 #endif
   NULL
 };
@@ -310,7 +315,12 @@ static const gcry_mac_spec_t * const mac_list_algo201[] =
     NULL,
 #endif
 #if USE_SM4
-    &_gcry_mac_type_spec_cmac_sm4
+    &_gcry_mac_type_spec_cmac_sm4,
+#else
+    NULL,
+#endif
+#if USE_ARIA
+    &_gcry_mac_type_spec_cmac_aria
 #else
     NULL
 #endif
@@ -345,7 +355,12 @@ static const gcry_mac_spec_t * const mac_list_algo401[] =
     NULL,
 #endif
 #if USE_SM4
-    &_gcry_mac_type_spec_gmac_sm4
+    &_gcry_mac_type_spec_gmac_sm4,
+#else
+    NULL,
+#endif
+#if USE_ARIA
+    &_gcry_mac_type_spec_gmac_aria
 #else
     NULL
 #endif
@@ -381,7 +396,12 @@ static const gcry_mac_spec_t * const mac_list_algo501[] =
     NULL,
 #endif
 #if USE_SM4
-    &_gcry_mac_type_spec_poly1305mac_sm4
+    &_gcry_mac_type_spec_poly1305mac_sm4,
+#else
+    NULL,
+#endif
+#if USE_ARIA
+    &_gcry_mac_type_spec_poly1305mac_aria
 #else
     NULL
 #endif
diff --git a/configure.ac b/configure.ac
index cc1104ca..9163b2ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,7 +212,7 @@ LIBGCRYPT_CONFIG_HOST="$host"
 # Definitions for symmetric ciphers.
 available_ciphers="arcfour blowfish cast5 des aes twofish serpent rfc2268 seed"
 available_ciphers="$available_ciphers camellia idea salsa20 gost28147 chacha20"
-available_ciphers="$available_ciphers sm4"
+available_ciphers="$available_ciphers sm4 aria"
 enabled_ciphers=""
 
 # Definitions for public-key ciphers.
@@ -3030,6 +3030,12 @@ if test "$found" = "1" ; then
    esac
 fi
 
+LIST_MEMBER(aria, $enabled_ciphers)
+if test "$found" = "1" ; then
+   GCRYPT_CIPHERS="$GCRYPT_CIPHERS aria.lo"
+   AC_DEFINE(USE_ARIA, 1, [Defined if this module should be included])
+fi
+
 LIST_MEMBER(dsa, $enabled_pubkey_ciphers)
 AM_CONDITIONAL(USE_DSA, [test "$found" = "1"])
 if test "$found" = "1" ; then
diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi
index db4ad1e6..e44c2f2e 100644
--- a/doc/gcrypt.texi
+++ b/doc/gcrypt.texi
@@ -1685,6 +1685,15 @@ A 128 bit cipher by the State Cryptography Administration
 of China (SCA).  See
 @uref{https://tools.ietf.org/html/draft-ribose-cfrg-sm4-10}.
 
+ at item  GCRY_CIPHER_ARIA128
+ at itemx GCRY_CIPHER_ARIA192
+ at itemx GCRY_CIPHER_ARIA256
+ at cindex ARIA (cipher)
+ARIA is a general-purpose block cipher algorithm developed by
+Korean cryptographers in 2003.  It was established as a Korean
+standard block cipher algorithm in 2004.  See
+ at uref{https://www.rfc-editor.org/rfc/rfc5794.html}.
+
 @end table
 
 @node Available cipher modes
@@ -4241,6 +4250,10 @@ block cipher algorithm.
 This is CMAC message authentication algorithm based on the SM4
 block cipher algorithm.
 
+ at item GCRY_MAC_CMAC_ARIA
+This is CMAC message authentication algorithm based on the ARIA
+block cipher algorithm.
+
 @item GCRY_MAC_GMAC_AES
 This is GMAC (GCM mode based MAC) message authentication algorithm based on
 the AES block cipher algorithm.
@@ -4265,6 +4278,10 @@ block cipher algorithm.
 This is GMAC message authentication algorithm based on the SM4
 block cipher algorithm.
 
+ at item GCRY_MAC_GMAC_ARIA
+This is GMAC message authentication algorithm based on the ARIA
+block cipher algorithm.
+
 @item GCRY_MAC_POLY1305
 This is plain Poly1305 message authentication algorithm, used with
 one-time key.
@@ -4293,6 +4310,10 @@ key and one-time nonce.
 This is Poly1305-SM4 message authentication algorithm, used with
 key and one-time nonce.
 
+ at item GCRY_MAC_POLY1305_ARIA
+This is Poly1305-ARIA message authentication algorithm, used with
+key and one-time nonce.
+
 @item GCRY_MAC_GOST28147_IMIT
 This is MAC construction defined in GOST 28147-89 (see RFC 5830 Section 8).
 
diff --git a/src/cipher.h b/src/cipher.h
index 9b890aeb..95ed43d7 100644
--- a/src/cipher.h
+++ b/src/cipher.h
@@ -171,6 +171,9 @@ extern gcry_cipher_spec_t _gcry_cipher_spec_gost28147;
 extern gcry_cipher_spec_t _gcry_cipher_spec_gost28147_mesh;
 extern gcry_cipher_spec_t _gcry_cipher_spec_chacha20;
 extern gcry_cipher_spec_t _gcry_cipher_spec_sm4;
+extern gcry_cipher_spec_t _gcry_cipher_spec_aria128;
+extern gcry_cipher_spec_t _gcry_cipher_spec_aria192;
+extern gcry_cipher_spec_t _gcry_cipher_spec_aria256;
 
 /* Declarations for the digest specifications.  */
 extern const gcry_md_spec_t _gcry_digest_spec_crc32;
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index 47d73339..aba22bfc 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -943,7 +943,10 @@ enum gcry_cipher_algos
     GCRY_CIPHER_GOST28147   = 315,
     GCRY_CIPHER_CHACHA20    = 316,
     GCRY_CIPHER_GOST28147_MESH   = 317, /* With CryptoPro key meshing.  */
-    GCRY_CIPHER_SM4         = 318
+    GCRY_CIPHER_SM4         = 318,
+    GCRY_CIPHER_ARIA128     = 319,
+    GCRY_CIPHER_ARIA192     = 320,
+    GCRY_CIPHER_ARIA256     = 321
   };
 
 /* The Rijndael algorithm is basically AES, so provide some macros. */
@@ -1510,6 +1513,7 @@ enum gcry_mac_algos
     GCRY_MAC_CMAC_IDEA          = 210,
     GCRY_MAC_CMAC_GOST28147     = 211,
     GCRY_MAC_CMAC_SM4           = 212,
+    GCRY_MAC_CMAC_ARIA          = 213,
 
     GCRY_MAC_GMAC_AES           = 401,
     GCRY_MAC_GMAC_CAMELLIA      = 402,
@@ -1517,6 +1521,7 @@ enum gcry_mac_algos
     GCRY_MAC_GMAC_SERPENT       = 404,
     GCRY_MAC_GMAC_SEED          = 405,
     GCRY_MAC_GMAC_SM4           = 406,
+    GCRY_MAC_GMAC_ARIA          = 407,
 
     GCRY_MAC_POLY1305           = 501,
     GCRY_MAC_POLY1305_AES       = 502,
@@ -1524,7 +1529,8 @@ enum gcry_mac_algos
     GCRY_MAC_POLY1305_TWOFISH   = 504,
     GCRY_MAC_POLY1305_SERPENT   = 505,
     GCRY_MAC_POLY1305_SEED      = 506,
-    GCRY_MAC_POLY1305_SM4       = 507
+    GCRY_MAC_POLY1305_SM4       = 507,
+    GCRY_MAC_POLY1305_ARIA      = 508
   };
 
 /* Flags used with the open function.  */
diff --git a/tests/basic.c b/tests/basic.c
index 429bd237..68f4557b 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -919,6 +919,306 @@ check_ecb_cipher (void)
 	}
       },
 #endif /* USE_SM4 */
+#if USE_ARIA
+      { GCRY_CIPHER_ARIA128,
+	"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+	0, FLAG_NOFIPS,
+	{ { "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	    16,
+	    16,
+	    "\xd7\x18\xfb\xd6\xab\x64\x4c\x73\x9d\xa9\x5f\x3b\xe6\x45\x17\x78" },
+	  { }
+	}
+      },
+      { GCRY_CIPHER_ARIA128,
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	0, FLAG_NOFIPS,
+	{ { "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd",
+	    16,
+	    4 * 10 * 16,
+	    "\xc6\xec\xd0\x8e\x22\xc3\x0a\xbd\xb2\x15\xcf\x74\xe2\x07\x5e\x6e"
+	    "\x29\xcc\xaa\xc6\x34\x48\x70\x8d\x33\x1b\x2f\x81\x6c\x51\xb1\x7d"
+	    "\x9e\x13\x3d\x15\x28\xdb\xf0\xaf\x57\x87\xc7\xf3\xa3\xf5\xc2\xbf"
+	    "\x6b\x6f\x34\x59\x07\xa3\x05\x56\x12\xce\x07\x2f\xf5\x4d\xe7\xd7"
+	    "\x88\x42\x4d\xa6\xe8\xcc\xfe\x81\x72\xb3\x91\xbe\x49\x93\x54\x16"
+	    "\x56\x65\xba\x78\x64\x91\x70\x00\xa6\xee\xb2\xec\xb4\xa6\x98\xed"
+	    "\xfc\x78\x87\xe7\xf5\x56\x37\x76\x14\xab\x0a\x28\x22\x93\xe6\xd8"
+	    "\x84\xdb\xb8\x42\x06\xcd\xb1\x6e\xd1\x75\x4e\x77\xa1\xf2\x43\xfd"
+	    "\x08\x69\x53\xf7\x52\xcc\x1e\x46\xc7\xc7\x94\xae\x85\x53\x7d\xca"
+	    "\xec\x8d\xd7\x21\xf5\x5c\x93\xb6\xed\xfe\x2a\xde\xa4\x38\x73\xe8"
+	    "\xc6\xec\xd0\x8e\x22\xc3\x0a\xbd\xb2\x15\xcf\x74\xe2\x07\x5e\x6e"
+	    "\x29\xcc\xaa\xc6\x34\x48\x70\x8d\x33\x1b\x2f\x81\x6c\x51\xb1\x7d"
+	    "\x9e\x13\x3d\x15\x28\xdb\xf0\xaf\x57\x87\xc7\xf3\xa3\xf5\xc2\xbf"
+	    "\x6b\x6f\x34\x59\x07\xa3\x05\x56\x12\xce\x07\x2f\xf5\x4d\xe7\xd7"
+	    "\x88\x42\x4d\xa6\xe8\xcc\xfe\x81\x72\xb3\x91\xbe\x49\x93\x54\x16"
+	    "\x56\x65\xba\x78\x64\x91\x70\x00\xa6\xee\xb2\xec\xb4\xa6\x98\xed"
+	    "\xfc\x78\x87\xe7\xf5\x56\x37\x76\x14\xab\x0a\x28\x22\x93\xe6\xd8"
+	    "\x84\xdb\xb8\x42\x06\xcd\xb1\x6e\xd1\x75\x4e\x77\xa1\xf2\x43\xfd"
+	    "\x08\x69\x53\xf7\x52\xcc\x1e\x46\xc7\xc7\x94\xae\x85\x53\x7d\xca"
+	    "\xec\x8d\xd7\x21\xf5\x5c\x93\xb6\xed\xfe\x2a\xde\xa4\x38\x73\xe8"
+	    "\xc6\xec\xd0\x8e\x22\xc3\x0a\xbd\xb2\x15\xcf\x74\xe2\x07\x5e\x6e"
+	    "\x29\xcc\xaa\xc6\x34\x48\x70\x8d\x33\x1b\x2f\x81\x6c\x51\xb1\x7d"
+	    "\x9e\x13\x3d\x15\x28\xdb\xf0\xaf\x57\x87\xc7\xf3\xa3\xf5\xc2\xbf"
+	    "\x6b\x6f\x34\x59\x07\xa3\x05\x56\x12\xce\x07\x2f\xf5\x4d\xe7\xd7"
+	    "\x88\x42\x4d\xa6\xe8\xcc\xfe\x81\x72\xb3\x91\xbe\x49\x93\x54\x16"
+	    "\x56\x65\xba\x78\x64\x91\x70\x00\xa6\xee\xb2\xec\xb4\xa6\x98\xed"
+	    "\xfc\x78\x87\xe7\xf5\x56\x37\x76\x14\xab\x0a\x28\x22\x93\xe6\xd8"
+	    "\x84\xdb\xb8\x42\x06\xcd\xb1\x6e\xd1\x75\x4e\x77\xa1\xf2\x43\xfd"
+	    "\x08\x69\x53\xf7\x52\xcc\x1e\x46\xc7\xc7\x94\xae\x85\x53\x7d\xca"
+	    "\xec\x8d\xd7\x21\xf5\x5c\x93\xb6\xed\xfe\x2a\xde\xa4\x38\x73\xe8"
+	    "\xc6\xec\xd0\x8e\x22\xc3\x0a\xbd\xb2\x15\xcf\x74\xe2\x07\x5e\x6e"
+	    "\x29\xcc\xaa\xc6\x34\x48\x70\x8d\x33\x1b\x2f\x81\x6c\x51\xb1\x7d"
+	    "\x9e\x13\x3d\x15\x28\xdb\xf0\xaf\x57\x87\xc7\xf3\xa3\xf5\xc2\xbf"
+	    "\x6b\x6f\x34\x59\x07\xa3\x05\x56\x12\xce\x07\x2f\xf5\x4d\xe7\xd7"
+	    "\x88\x42\x4d\xa6\xe8\xcc\xfe\x81\x72\xb3\x91\xbe\x49\x93\x54\x16"
+	    "\x56\x65\xba\x78\x64\x91\x70\x00\xa6\xee\xb2\xec\xb4\xa6\x98\xed"
+	    "\xfc\x78\x87\xe7\xf5\x56\x37\x76\x14\xab\x0a\x28\x22\x93\xe6\xd8"
+	    "\x84\xdb\xb8\x42\x06\xcd\xb1\x6e\xd1\x75\x4e\x77\xa1\xf2\x43\xfd"
+	    "\x08\x69\x53\xf7\x52\xcc\x1e\x46\xc7\xc7\x94\xae\x85\x53\x7d\xca"
+	    "\xec\x8d\xd7\x21\xf5\x5c\x93\xb6\xed\xfe\x2a\xde\xa4\x38\x73\xe8" },
+	  { }
+	}
+      },
+      { GCRY_CIPHER_ARIA192,
+	"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+        "\x10\x11\x12\x13\x14\x15\x16\x17",
+	0, FLAG_NOFIPS,
+	{ { "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	    24,
+	    16,
+	    "\x26\x44\x9c\x18\x05\xdb\xe7\xaa\x25\xa4\x68\xce\x26\x3a\x9e\x79" },
+	  { }
+	}
+      },
+      { GCRY_CIPHER_ARIA192,
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff"
+        "\x00\x11\x22\x33\x44\x55\x66\x77",
+	0, FLAG_NOFIPS,
+	{ { "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd",
+	    24,
+	    4 * 10 * 16,
+	    "\x8d\x14\x70\x62\x5f\x59\xeb\xac\xb0\xe5\x5b\x53\x4b\x3e\x46\x2b"
+	    "\x5f\x23\xd3\x3b\xff\x78\xf4\x6c\x3c\x15\x91\x1f\x4a\x21\x80\x9a"
+	    "\xac\xca\xd8\x0b\x4b\xda\x91\x5a\xa9\xda\xe6\xbc\xeb\xe0\x6a\x6c"
+	    "\x83\xf7\x7f\xd5\x39\x1a\xcf\xe6\x1d\xe2\xf6\x46\xb5\xd4\x47\xed"
+	    "\xbf\xd5\xbb\x49\xb1\x2f\xbb\x91\x45\xb2\x27\x89\x5a\x75\x7b\x2a"
+	    "\xf1\xf7\x18\x87\x34\x86\x3d\x7b\x8b\x6e\xde\x5a\x5b\x2f\x06\xa0"
+	    "\xa2\x33\xc8\x52\x3d\x2d\xb7\x78\xfb\x31\xb0\xe3\x11\xf3\x27\x00"
+	    "\x15\x2f\x33\x86\x1e\x9d\x04\x0c\x83\xb5\xeb\x40\xcd\x88\xea\x49"
+	    "\x97\x57\x09\xdc\x62\x93\x65\xa1\x89\xf7\x8a\x3e\xc4\x03\x45\xfc"
+	    "\x6a\x5a\x30\x7a\x8f\x9a\x44\x13\x09\x1e\x00\x7e\xca\x56\x45\xa0"
+	    "\x8d\x14\x70\x62\x5f\x59\xeb\xac\xb0\xe5\x5b\x53\x4b\x3e\x46\x2b"
+	    "\x5f\x23\xd3\x3b\xff\x78\xf4\x6c\x3c\x15\x91\x1f\x4a\x21\x80\x9a"
+	    "\xac\xca\xd8\x0b\x4b\xda\x91\x5a\xa9\xda\xe6\xbc\xeb\xe0\x6a\x6c"
+	    "\x83\xf7\x7f\xd5\x39\x1a\xcf\xe6\x1d\xe2\xf6\x46\xb5\xd4\x47\xed"
+	    "\xbf\xd5\xbb\x49\xb1\x2f\xbb\x91\x45\xb2\x27\x89\x5a\x75\x7b\x2a"
+	    "\xf1\xf7\x18\x87\x34\x86\x3d\x7b\x8b\x6e\xde\x5a\x5b\x2f\x06\xa0"
+	    "\xa2\x33\xc8\x52\x3d\x2d\xb7\x78\xfb\x31\xb0\xe3\x11\xf3\x27\x00"
+	    "\x15\x2f\x33\x86\x1e\x9d\x04\x0c\x83\xb5\xeb\x40\xcd\x88\xea\x49"
+	    "\x97\x57\x09\xdc\x62\x93\x65\xa1\x89\xf7\x8a\x3e\xc4\x03\x45\xfc"
+	    "\x6a\x5a\x30\x7a\x8f\x9a\x44\x13\x09\x1e\x00\x7e\xca\x56\x45\xa0"
+	    "\x8d\x14\x70\x62\x5f\x59\xeb\xac\xb0\xe5\x5b\x53\x4b\x3e\x46\x2b"
+	    "\x5f\x23\xd3\x3b\xff\x78\xf4\x6c\x3c\x15\x91\x1f\x4a\x21\x80\x9a"
+	    "\xac\xca\xd8\x0b\x4b\xda\x91\x5a\xa9\xda\xe6\xbc\xeb\xe0\x6a\x6c"
+	    "\x83\xf7\x7f\xd5\x39\x1a\xcf\xe6\x1d\xe2\xf6\x46\xb5\xd4\x47\xed"
+	    "\xbf\xd5\xbb\x49\xb1\x2f\xbb\x91\x45\xb2\x27\x89\x5a\x75\x7b\x2a"
+	    "\xf1\xf7\x18\x87\x34\x86\x3d\x7b\x8b\x6e\xde\x5a\x5b\x2f\x06\xa0"
+	    "\xa2\x33\xc8\x52\x3d\x2d\xb7\x78\xfb\x31\xb0\xe3\x11\xf3\x27\x00"
+	    "\x15\x2f\x33\x86\x1e\x9d\x04\x0c\x83\xb5\xeb\x40\xcd\x88\xea\x49"
+	    "\x97\x57\x09\xdc\x62\x93\x65\xa1\x89\xf7\x8a\x3e\xc4\x03\x45\xfc"
+	    "\x6a\x5a\x30\x7a\x8f\x9a\x44\x13\x09\x1e\x00\x7e\xca\x56\x45\xa0"
+	    "\x8d\x14\x70\x62\x5f\x59\xeb\xac\xb0\xe5\x5b\x53\x4b\x3e\x46\x2b"
+	    "\x5f\x23\xd3\x3b\xff\x78\xf4\x6c\x3c\x15\x91\x1f\x4a\x21\x80\x9a"
+	    "\xac\xca\xd8\x0b\x4b\xda\x91\x5a\xa9\xda\xe6\xbc\xeb\xe0\x6a\x6c"
+	    "\x83\xf7\x7f\xd5\x39\x1a\xcf\xe6\x1d\xe2\xf6\x46\xb5\xd4\x47\xed"
+	    "\xbf\xd5\xbb\x49\xb1\x2f\xbb\x91\x45\xb2\x27\x89\x5a\x75\x7b\x2a"
+	    "\xf1\xf7\x18\x87\x34\x86\x3d\x7b\x8b\x6e\xde\x5a\x5b\x2f\x06\xa0"
+	    "\xa2\x33\xc8\x52\x3d\x2d\xb7\x78\xfb\x31\xb0\xe3\x11\xf3\x27\x00"
+	    "\x15\x2f\x33\x86\x1e\x9d\x04\x0c\x83\xb5\xeb\x40\xcd\x88\xea\x49"
+	    "\x97\x57\x09\xdc\x62\x93\x65\xa1\x89\xf7\x8a\x3e\xc4\x03\x45\xfc"
+	    "\x6a\x5a\x30\x7a\x8f\x9a\x44\x13\x09\x1e\x00\x7e\xca\x56\x45\xa0" },
+	  { }
+	}
+      },
+      { GCRY_CIPHER_ARIA256,
+	"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+        "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
+	0, FLAG_NOFIPS,
+	{ { "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	    32,
+	    16,
+	    "\xf9\x2b\xd7\xc7\x9f\xb7\x2e\x2f\x2b\x8f\x80\xc1\x97\x2d\x24\xfc" },
+	  { }
+	}
+      },
+      { GCRY_CIPHER_ARIA256,
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff"
+        "\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	0, FLAG_NOFIPS,
+	{ { "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd"
+	    "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd",
+	    32,
+	    4 * 10 * 16,
+	    "\x58\xa8\x75\xe6\x04\x4a\xd7\xff\xfa\x4f\x58\x42\x0f\x7f\x44\x2d"
+	    "\x8e\x19\x10\x16\xf2\x8e\x79\xae\xfc\x01\xe2\x04\x77\x32\x80\xd7"
+	    "\x01\x8e\x5f\x7a\x93\x8e\xc3\x07\x11\x71\x99\x53\xba\xe8\x65\x42"
+	    "\xcd\x7e\xbc\x75\x24\x74\xc1\xa5\xf6\xea\xaa\xce\x2a\x7e\x29\x46"
+	    "\x2e\xe7\xdf\xa5\xaf\xdb\x84\x17\x7e\xad\x95\xcc\xd4\xb4\xbb\x6e"
+	    "\x1e\xd1\x7b\x95\x34\xcf\xf0\xa5\xfc\x29\x41\x42\x9c\xfe\xe2\xee"
+	    "\x49\xc7\xad\xbe\xb7\xe9\xd1\xb0\xd2\xa8\x53\x1d\x94\x20\x79\x59"
+	    "\x6a\x27\xed\x79\xf5\xb1\xdd\x13\xec\xd6\x04\xb0\x7a\x48\x88\x5a"
+	    "\x3a\xfa\x06\x27\xa0\xe4\xe6\x0a\x3c\x70\x3a\xf2\x92\xf1\xba\xa7"
+	    "\x7b\x70\x2f\x16\xc5\x4a\xa7\x4b\xc7\x27\xea\x95\xc7\x46\x8b\x00"
+	    "\x58\xa8\x75\xe6\x04\x4a\xd7\xff\xfa\x4f\x58\x42\x0f\x7f\x44\x2d"
+	    "\x8e\x19\x10\x16\xf2\x8e\x79\xae\xfc\x01\xe2\x04\x77\x32\x80\xd7"
+	    "\x01\x8e\x5f\x7a\x93\x8e\xc3\x07\x11\x71\x99\x53\xba\xe8\x65\x42"
+	    "\xcd\x7e\xbc\x75\x24\x74\xc1\xa5\xf6\xea\xaa\xce\x2a\x7e\x29\x46"
+	    "\x2e\xe7\xdf\xa5\xaf\xdb\x84\x17\x7e\xad\x95\xcc\xd4\xb4\xbb\x6e"
+	    "\x1e\xd1\x7b\x95\x34\xcf\xf0\xa5\xfc\x29\x41\x42\x9c\xfe\xe2\xee"
+	    "\x49\xc7\xad\xbe\xb7\xe9\xd1\xb0\xd2\xa8\x53\x1d\x94\x20\x79\x59"
+	    "\x6a\x27\xed\x79\xf5\xb1\xdd\x13\xec\xd6\x04\xb0\x7a\x48\x88\x5a"
+	    "\x3a\xfa\x06\x27\xa0\xe4\xe6\x0a\x3c\x70\x3a\xf2\x92\xf1\xba\xa7"
+	    "\x7b\x70\x2f\x16\xc5\x4a\xa7\x4b\xc7\x27\xea\x95\xc7\x46\x8b\x00"
+	    "\x58\xa8\x75\xe6\x04\x4a\xd7\xff\xfa\x4f\x58\x42\x0f\x7f\x44\x2d"
+	    "\x8e\x19\x10\x16\xf2\x8e\x79\xae\xfc\x01\xe2\x04\x77\x32\x80\xd7"
+	    "\x01\x8e\x5f\x7a\x93\x8e\xc3\x07\x11\x71\x99\x53\xba\xe8\x65\x42"
+	    "\xcd\x7e\xbc\x75\x24\x74\xc1\xa5\xf6\xea\xaa\xce\x2a\x7e\x29\x46"
+	    "\x2e\xe7\xdf\xa5\xaf\xdb\x84\x17\x7e\xad\x95\xcc\xd4\xb4\xbb\x6e"
+	    "\x1e\xd1\x7b\x95\x34\xcf\xf0\xa5\xfc\x29\x41\x42\x9c\xfe\xe2\xee"
+	    "\x49\xc7\xad\xbe\xb7\xe9\xd1\xb0\xd2\xa8\x53\x1d\x94\x20\x79\x59"
+	    "\x6a\x27\xed\x79\xf5\xb1\xdd\x13\xec\xd6\x04\xb0\x7a\x48\x88\x5a"
+	    "\x3a\xfa\x06\x27\xa0\xe4\xe6\x0a\x3c\x70\x3a\xf2\x92\xf1\xba\xa7"
+	    "\x7b\x70\x2f\x16\xc5\x4a\xa7\x4b\xc7\x27\xea\x95\xc7\x46\x8b\x00"
+	    "\x58\xa8\x75\xe6\x04\x4a\xd7\xff\xfa\x4f\x58\x42\x0f\x7f\x44\x2d"
+	    "\x8e\x19\x10\x16\xf2\x8e\x79\xae\xfc\x01\xe2\x04\x77\x32\x80\xd7"
+	    "\x01\x8e\x5f\x7a\x93\x8e\xc3\x07\x11\x71\x99\x53\xba\xe8\x65\x42"
+	    "\xcd\x7e\xbc\x75\x24\x74\xc1\xa5\xf6\xea\xaa\xce\x2a\x7e\x29\x46"
+	    "\x2e\xe7\xdf\xa5\xaf\xdb\x84\x17\x7e\xad\x95\xcc\xd4\xb4\xbb\x6e"
+	    "\x1e\xd1\x7b\x95\x34\xcf\xf0\xa5\xfc\x29\x41\x42\x9c\xfe\xe2\xee"
+	    "\x49\xc7\xad\xbe\xb7\xe9\xd1\xb0\xd2\xa8\x53\x1d\x94\x20\x79\x59"
+	    "\x6a\x27\xed\x79\xf5\xb1\xdd\x13\xec\xd6\x04\xb0\x7a\x48\x88\x5a"
+	    "\x3a\xfa\x06\x27\xa0\xe4\xe6\x0a\x3c\x70\x3a\xf2\x92\xf1\xba\xa7"
+	    "\x7b\x70\x2f\x16\xc5\x4a\xa7\x4b\xc7\x27\xea\x95\xc7\x46\x8b\x00" },
+	  { }
+	}
+      },
+#endif /* USE_ARIA */
     };
   gcry_cipher_hd_t hde, hdd;
   unsigned char out[MAX_DATA_LEN];
@@ -2180,6 +2480,91 @@ check_ctr_cipher (void)
         }
       },
 #endif /* USE_SM4 */
+#if USE_ARIA
+      { GCRY_CIPHER_ARIA128, FLAG_NOFIPS,
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+	{ { "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd",
+	    10 * 16,
+	    "\xac\x5d\x7d\xe8\x05\xa0\xbf\x1c\x57\xc8\x54\x50\x1a\xf6\x0f\xa1"
+	    "\x14\x97\xe2\xa3\x45\x19\xde\xa1\x56\x9e\x91\xe5\xb5\xcc\xae\x2f"
+	    "\xf3\xbf\xa1\xbf\x97\x5f\x45\x71\xf4\x8b\xe1\x91\x61\x35\x46\xc3"
+	    "\x91\x11\x63\xc0\x85\xf8\x71\xf0\xe7\xae\x5f\x2a\x08\x5b\x81\x85"
+	    "\x1c\x2a\x3d\xdf\x20\xec\xb8\xfa\x51\x90\x1a\xec\x8e\xe4\xba\x32"
+	    "\xa3\x5d\xab\x67\xbb\x72\xcd\x91\x40\xad\x18\x8a\x96\x7a\xc0\xfb"
+	    "\xbd\xfa\x94\xea\x6c\xce\x47\xdc\xf8\x52\x5a\xb5\xa8\x14\xcf\xeb"
+	    "\x2b\xb6\x0e\xe2\xb1\x26\xe2\xd9\xd8\x47\xc1\xa9\xe9\x6f\x90\x19"
+	    "\xe3\xe6\xa7\xfe\x40\xd3\x82\x9a\xfb\x73\xdb\x1c\xc2\x45\x64\x6a"
+	    "\xdd\xb6\x2d\x9b\x90\x7b\xaa\xaf\xbe\x46\xa7\x3d\xbc\x13\x1d\x3d" },
+	  { "", 0, "" }
+        }
+      },
+      { GCRY_CIPHER_ARIA192, FLAG_NOFIPS,
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff"
+	"\x00\x11\x22\x33\x44\x55\x66\x77",
+	"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+	{ { "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd",
+	    10 * 16,
+	    "\x08\x62\x5c\xa8\xfe\x56\x9c\x19\xba\x7a\xf3\x76\x0a\x6e\xd1\xce"
+	    "\xf4\xd1\x99\x26\x3e\x99\x9d\xde\x14\x08\x2d\xbb\xa7\x56\x0b\x79"
+	    "\xa4\xc6\xb4\x56\xb8\x70\x7d\xce\x75\x1f\x98\x54\xf1\x88\x93\xdf"
+	    "\xdb\x3f\x4e\x5a\xfa\x53\x97\x33\xe6\xf1\xe7\x0b\x98\xba\x37\x89"
+	    "\x1f\x8f\x81\xe9\x5d\xf8\xef\xc2\x6c\x7c\xe0\x43\x50\x4c\xb1\x89"
+	    "\x58\xb8\x65\xe4\xe3\x16\xcd\x2a\xa1\xc9\x7f\x31\xbf\x23\xdc\x04"
+	    "\x6e\xf3\x26\xb9\x5a\x69\x2a\x19\x1b\xa0\xf2\xa4\x1c\x5f\xe9\xae"
+	    "\x07\x0f\x23\x6f\xf7\x07\x8e\x70\x3b\x42\x66\x6c\xaa\xfb\xdd\x20"
+	    "\xba\xd7\x4a\xc4\xc2\x0c\x0f\x46\xc7\xca\x24\xc1\x51\x71\x65\x75"
+	    "\xc9\x47\xda\x16\xc9\x0c\xfe\x1b\xf2\x17\xa4\x1c\xfe\xbe\x75\x31" },
+	  { "", 0, "" }
+        }
+      },
+      { GCRY_CIPHER_ARIA256, FLAG_NOFIPS,
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff"
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
+	{ { "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd",
+	    10 * 16,
+	    "\x30\x02\x6c\x32\x96\x66\x14\x17\x21\x17\x8b\x99\xc0\xa1\xf1\xb2"
+	    "\xf0\x69\x40\x25\x3f\x7b\x30\x89\xe2\xa3\x0e\xa8\x6a\xa3\xc8\x8f"
+	    "\x59\x40\xf0\x5a\xd7\xee\x41\xd7\x13\x47\xbb\x72\x61\xe3\x48\xf1"
+	    "\x83\x60\x47\x3f\xdf\x7d\x4e\x77\x23\xbf\xfb\x44\x11\xcc\x13\xf6"
+	    "\xcd\xd8\x9f\x3b\xc7\xb9\xc7\x68\x14\x50\x22\xc7\xa7\x4f\x14\xd7"
+	    "\xc3\x05\xcd\x01\x2a\x10\xf1\x60\x50\xc2\x3f\x1a\xe5\xc2\x3f\x45"
+	    "\x99\x8d\x13\xfb\xaa\x04\x1e\x51\x61\x95\x77\xe0\x77\x27\x64\x89"
+	    "\x6a\x5d\x45\x16\xd8\xff\xce\xb3\xbf\x7e\x05\xf6\x13\xed\xd9\xa6"
+	    "\x0c\xdc\xed\xaf\xf9\xcf\xca\xf4\xe0\x0d\x44\x5a\x54\x33\x4f\x73"
+	    "\xab\x2c\xad\x94\x4e\x51\xd2\x66\x54\x8e\x61\xc6\xeb\x0a\xa1\xcd" },
+	  { "", 0, "" }
+        }
+      },
+#endif /* USE_ARIA */
       {	0, 0,
 	"",
 	"",
@@ -2716,6 +3101,60 @@ check_cfb_cipher (void)
 	}
       },
 #endif /* USE_SM4 */
+#if USE_ARIA
+      { GCRY_CIPHER_ARIA128, FLAG_NOFIPS,
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	"\x0f\x1e\x2d\x3c\x4b\x5a\x69\x78\x87\x96\xa5\xb4\xc3\xd2\xe1\xf0",
+	{ { "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd",
+	    10 * 16,
+	    "\x37\x20\xe5\x3b\xa7\xd6\x15\x38\x34\x06\xb0\x9f\x0a\x05\xa2\x00"
+	    "\xc0\x7c\x21\xe6\x37\x0f\x41\x3a\x5d\x13\x25\x00\xa6\x82\x85\x01"
+	    "\x7c\x61\xb4\x34\xc7\xb7\xca\x96\x85\xa5\x10\x71\x86\x1e\x4d\x4b"
+	    "\xb8\x73\xb5\x99\xb4\x79\xe2\xd5\x73\xdd\xde\xaf\xba\x89\xf8\x12"
+	    "\xac\x6a\x9e\x44\xd5\x54\x07\x8e\xb3\xbe\x94\x83\x9d\xb4\xb3\x3d"
+	    "\xa3\xf5\x9c\x06\x31\x23\xa7\xef\x6f\x20\xe1\x05\x79\xfa\x4f\xd2"
+	    "\x39\x10\x0c\xa7\x3b\x52\xd4\xfc\xaf\xea\xde\xe7\x3f\x13\x9f\x78"
+	    "\xf9\xb7\x61\x4c\x2b\x3b\x9d\xbe\x01\x0f\x87\xdb\x06\xa8\x9a\x94"
+	    "\x35\xf7\x9c\xe8\x12\x14\x31\x37\x1f\x4e\x87\xb9\x84\xe0\x23\x0c"
+	    "\x22\xa6\xda\xcb\x32\xfc\x42\xdc\xc6\xac\xce\xf3\x32\x85\xbf\x11" },
+	}
+      },
+      { GCRY_CIPHER_ARIA128, FLAG_NOFIPS | FLAG_CFB8,
+	"\x00\x11\x22\x33\x44\x55\x66\x77\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
+	"\x0f\x1e\x2d\x3c\x4b\x5a\x69\x78\x87\x96\xa5\xb4\xc3\xd2\xe1\xf0",
+	{ { "\x11\x11\x11\x11\xaa\xaa\xaa\xaa\x11\x11\x11\x11\xbb\xbb\xbb\xbb"
+	    "\x11\x11\x11\x11\xcc\xcc\xcc\xcc\x11\x11\x11\x11\xdd\xdd\xdd\xdd"
+	    "\x22\x22\x22\x22\xaa\xaa\xaa\xaa\x22\x22\x22\x22\xbb\xbb\xbb\xbb"
+	    "\x22\x22\x22\x22\xcc\xcc\xcc\xcc\x22\x22\x22\x22\xdd\xdd\xdd\xdd"
+	    "\x33\x33\x33\x33\xaa\xaa\xaa\xaa\x33\x33\x33\x33\xbb\xbb\xbb\xbb"
+	    "\x33\x33\x33\x33\xcc\xcc\xcc\xcc\x33\x33\x33\x33\xdd\xdd\xdd\xdd"
+	    "\x44\x44\x44\x44\xaa\xaa\xaa\xaa\x44\x44\x44\x44\xbb\xbb\xbb\xbb"
+	    "\x44\x44\x44\x44\xcc\xcc\xcc\xcc\x44\x44\x44\x44\xdd\xdd\xdd\xdd"
+	    "\x55\x55\x55\x55\xaa\xaa\xaa\xaa\x55\x55\x55\x55\xbb\xbb\xbb\xbb"
+	    "\x55\x55\x55\x55\xcc\xcc\xcc\xcc\x55\x55\x55\x55\xdd\xdd\xdd\xdd",
+	    10 * 16,
+	    "\x37\x3c\x8f\x6a\x96\x55\x99\xec\x78\x5c\xc8\xf8\x14\x9f\x6c\x81"
+	    "\xb6\x32\xcc\xb8\xe0\xc6\xeb\x6a\x97\x07\xae\x52\xc5\x92\x57\xa4"
+	    "\x1f\x94\x70\x1c\x10\x96\x93\x31\x27\xa9\x01\x95\xed\x0c\x8e\x98"
+	    "\x69\x05\x47\x57\x24\x23\xbb\x45\xc3\xd7\x0e\x4a\x18\xee\x56\xb9"
+	    "\x67\xc1\x0e\x00\x0b\xa4\xdf\x5f\xba\x7c\x40\x41\x34\xa3\x43\xd8"
+	    "\x37\x5d\x04\xb1\x51\xd1\x61\xef\x83\x41\x7f\xe1\x74\x84\x47\xd3"
+	    "\x0a\x67\x23\xc4\x06\x73\x3d\xf7\xd1\x8a\xa3\x9a\x20\x75\x2d\x23"
+	    "\x81\x94\x2e\x24\x48\x11\xbb\x97\xf7\x2e\xae\x44\x6b\x18\x15\xaa"
+	    "\x69\x0c\xd1\xb1\xad\xcb\xd0\x07\xc0\x08\x8e\xcd\xc9\x1c\xb2\xe2"
+	    "\xca\xf0\xe1\x1e\x72\x45\x98\x78\x13\x7e\xea\x64\xac\x62\xa9\xa1" },
+	}
+      },
+#endif /* USE_ARIA */
     };
   gcry_cipher_hd_t hde, hdd;
   unsigned char out[MAX_DATA_LEN];
@@ -9342,6 +9781,14 @@ check_ocb_cipher (void)
   check_ocb_cipher_largebuf(GCRY_CIPHER_SM4, 16,
     "\x3c\x32\x54\x5d\xc5\x17\xa1\x16\x3f\x8e\xc7\x1d\x8d\x8b\x2d\xb0");
 #endif /* USE_SM4 */
+#if USE_ARIA
+  check_ocb_cipher_largebuf(GCRY_CIPHER_ARIA128, 16,
+    "\x6c\xcc\x69\x34\x3b\xa3\x55\xe5\xdc\xf6\x13\xe0\x5b\x08\x6a\xd9");
+  check_ocb_cipher_largebuf(GCRY_CIPHER_ARIA192, 24,
+    "\x78\xcb\x2e\xa4\x76\xca\x4b\x01\xe8\x34\x44\x00\x9a\x99\x99\x01");
+  check_ocb_cipher_largebuf(GCRY_CIPHER_ARIA256, 32,
+    "\x70\x92\x29\xf5\xbc\x73\xa8\x02\xcc\x80\xac\x0b\xd4\x86\x7f\x43");
+#endif /* USE_ARIA */
 
   /* Check that the AAD data is correctly buffered.  */
   check_ocb_cipher_splitaad ();
@@ -13008,6 +13455,11 @@ check_ciphers (void)
 #endif
 #if USE_SM4
     GCRY_CIPHER_SM4,
+#endif
+#if USE_ARIA
+    GCRY_CIPHER_ARIA128,
+    GCRY_CIPHER_ARIA192,
+    GCRY_CIPHER_ARIA256,
 #endif
     0
   };
@@ -17751,6 +18203,7 @@ main (int argc, char **argv)
         {
           check_ciphers ();
           check_cipher_modes ();
+          check_bulk_cipher_modes ();
         }
       else if (hash_only)
         {
diff --git a/tests/bench-slope.c b/tests/bench-slope.c
index eb301569..99b444e0 100644
--- a/tests/bench-slope.c
+++ b/tests/bench-slope.c
@@ -2064,6 +2064,7 @@ bench_mac_init (struct bench_obj *obj)
     case GCRY_MAC_POLY1305_SERPENT:
     case GCRY_MAC_POLY1305_SEED:
     case GCRY_MAC_POLY1305_SM4:
+    case GCRY_MAC_POLY1305_ARIA:
       gcry_mac_setiv (hd, key, 16);
       break;
     }
diff --git a/tests/benchmark.c b/tests/benchmark.c
index 60abd2cb..cf8182a6 100644
--- a/tests/benchmark.c
+++ b/tests/benchmark.c
@@ -652,7 +652,7 @@ mac_bench ( const char *algoname )
   for (i=0; i < bufsize; i++)
     buf[i] = i;
 
-  if (algo >= GCRY_MAC_POLY1305_AES && algo <= GCRY_MAC_POLY1305_SM4)
+  if (algo >= GCRY_MAC_POLY1305_AES && algo <= GCRY_MAC_POLY1305_ARIA)
     {
       static const char iv[16] = { 1, 2, 3, 4, };
       err = gcry_mac_setiv(hd, iv, sizeof(iv));
-- 
2.37.2




More information about the Gcrypt-devel mailing list