First pass at applying KNF to the OpenSSL code, which almost makes it
authorjsing <jsing@openbsd.org>
Tue, 15 Apr 2014 14:38:10 +0000 (14:38 +0000)
committerjsing <jsing@openbsd.org>
Tue, 15 Apr 2014 14:38:10 +0000 (14:38 +0000)
readable. This pass is whitespace only and can readily be verified using
tr and md5.

22 files changed:
lib/libcrypto/aes/aes.h
lib/libcrypto/aes/aes_cbc.c
lib/libcrypto/aes/aes_cfb.c
lib/libcrypto/aes/aes_core.c
lib/libcrypto/aes/aes_ctr.c
lib/libcrypto/aes/aes_ecb.c
lib/libcrypto/aes/aes_ige.c
lib/libcrypto/aes/aes_misc.c
lib/libcrypto/aes/aes_ofb.c
lib/libcrypto/aes/aes_wrap.c
lib/libcrypto/aes/aes_x86core.c
lib/libssl/src/crypto/aes/aes.h
lib/libssl/src/crypto/aes/aes_cbc.c
lib/libssl/src/crypto/aes/aes_cfb.c
lib/libssl/src/crypto/aes/aes_core.c
lib/libssl/src/crypto/aes/aes_ctr.c
lib/libssl/src/crypto/aes/aes_ecb.c
lib/libssl/src/crypto/aes/aes_ige.c
lib/libssl/src/crypto/aes/aes_misc.c
lib/libssl/src/crypto/aes/aes_ofb.c
lib/libssl/src/crypto/aes/aes_wrap.c
lib/libssl/src/crypto/aes/aes_x86core.c

index 031abf0..4d477bd 100644 (file)
@@ -75,69 +75,61 @@ extern "C" {
 /* This should be a hidden type, but EVP requires that the size be known */
 struct aes_key_st {
 #ifdef AES_LONG
-    unsigned long rd_key[4 *(AES_MAXNR + 1)];
+       unsigned long rd_key[4 *(AES_MAXNR + 1)];
 #else
-    unsigned int rd_key[4 *(AES_MAXNR + 1)];
+       unsigned int rd_key[4 *(AES_MAXNR + 1)];
 #endif
-    int rounds;
+       int rounds;
 };
 typedef struct aes_key_st AES_KEY;
 
 const char *AES_options(void);
 
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-       AES_KEY *key);
+    AES_KEY *key);
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-       AES_KEY *key);
+    AES_KEY *key);
 
 int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-       AES_KEY *key);
+    AES_KEY *key);
 int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-       AES_KEY *key);
+    AES_KEY *key);
 
 void AES_encrypt(const unsigned char *in, unsigned char *out,
-       const AES_KEY *key);
+    const AES_KEY *key);
 void AES_decrypt(const unsigned char *in, unsigned char *out,
-       const AES_KEY *key);
+    const AES_KEY *key);
 
 void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-       const AES_KEY *key, const int enc);
+    const AES_KEY *key, const int enc);
 void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, const int enc);
 void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num);
 void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char ivec[AES_BLOCK_SIZE],
-       unsigned char ecount_buf[AES_BLOCK_SIZE],
-       unsigned int *num);
+    size_t length, const AES_KEY *key, unsigned char ivec[AES_BLOCK_SIZE],
+    unsigned char ecount_buf[AES_BLOCK_SIZE], unsigned int *num);
 /* NB: the IV is _two_ blocks long */
 void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                    size_t length, const AES_KEY *key,
-                    unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, const int enc);
 /* NB: the IV is _four_ blocks long */
 void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const AES_KEY *key,
-                       const AES_KEY *key2, const unsigned char *ivec,
-                       const int enc);
-
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, unsigned int inlen);
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, unsigned int inlen);
+    size_t length, const AES_KEY *key, const AES_KEY *key2,
+    const unsigned char *ivec, const int enc);
+
+int AES_wrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen);
+int AES_unwrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen);
 
 
 #ifdef  __cplusplus
index 227f756..9430e04 100644 (file)
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                    size_t len, const AES_KEY *key,
-                    unsigned char *ivec, const int enc) {
-
+void
+AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
+    size_t len, const AES_KEY *key, unsigned char *ivec, const int enc)
+{
        if (enc)
-               CRYPTO_cbc128_encrypt(in,out,len,key,ivec,(block128_f)AES_encrypt);
+               CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
+                   (block128_f)AES_encrypt);
        else
-               CRYPTO_cbc128_decrypt(in,out,len,key,ivec,(block128_f)AES_decrypt);
+               CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
+                   (block128_f)AES_decrypt);
 }
index 0c6d058..b496a04 100644 (file)
  * 128bit block we have used is contained in *num;
  */
 
-void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num, const int enc) {
-
-       CRYPTO_cfb128_encrypt(in,out,length,key,ivec,num,enc,(block128_f)AES_encrypt);
+void
+AES_cfb128_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
+{
+       CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
+           (block128_f)AES_encrypt);
 }
 
 /* N.B. This expects the input to be packed, MS bit first */
-void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, int *num, const int enc)
-    {
-    CRYPTO_cfb128_1_encrypt(in,out,length,key,ivec,num,enc,(block128_f)AES_encrypt);
-    }
+void
+AES_cfb1_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
+{
+       CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
+           (block128_f)AES_encrypt);
+}
 
-void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, int *num, const int enc)
-    {
-    CRYPTO_cfb128_8_encrypt(in,out,length,key,ivec,num,enc,(block128_f)AES_encrypt);
-    }
+void
+AES_cfb8_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
+{
+       CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
+           (block128_f)AES_encrypt);
+}
 
index 8f5210a..05ffbfb 100644 (file)
@@ -54,567 +54,567 @@ Td4[x] = Si[x].[01];
 */
 
 static const u32 Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
+       0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
+       0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
+       0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
+       0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
+       0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
+       0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
+       0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
+       0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
+       0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
+       0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
+       0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
+       0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
+       0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
+       0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
+       0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
+       0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
+       0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
+       0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
+       0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
+       0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
+       0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
+       0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
+       0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
+       0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
+       0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
+       0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
+       0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
+       0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
+       0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
+       0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
+       0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
+       0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
+       0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
+       0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
+       0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
+       0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
+       0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
+       0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
+       0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
+       0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
+       0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
+       0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
+       0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
+       0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
+       0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
+       0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
+       0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
+       0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
+       0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
+       0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
+       0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
+       0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
+       0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
+       0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
+       0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
+       0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
+       0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
+       0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
+       0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
+       0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
+       0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
+       0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
+       0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
+       0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
 };
 static const u32 Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
+       0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
+       0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
+       0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
+       0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
+       0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
+       0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
+       0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
+       0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
+       0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
+       0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
+       0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
+       0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
+       0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
+       0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
+       0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
+       0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
+       0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
+       0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
+       0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
+       0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
+       0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
+       0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
+       0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
+       0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
+       0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
+       0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
+       0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
+       0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
+       0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
+       0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
+       0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
+       0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
+       0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
+       0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
+       0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
+       0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
+       0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
+       0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
+       0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
+       0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
+       0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
+       0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
+       0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
+       0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
+       0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
+       0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
+       0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
+       0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
+       0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
+       0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
+       0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
+       0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
+       0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
+       0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
+       0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
+       0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
+       0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
+       0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
+       0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
+       0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
+       0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
+       0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
+       0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
+       0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
 };
 static const u32 Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
+       0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
+       0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
+       0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
+       0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
+       0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
+       0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
+       0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
+       0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
+       0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
+       0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
+       0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
+       0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
+       0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
+       0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
+       0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
+       0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
+       0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
+       0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
+       0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
+       0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
+       0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
+       0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
+       0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
+       0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
+       0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
+       0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
+       0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
+       0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
+       0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
+       0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
+       0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
+       0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
+       0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
+       0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
+       0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
+       0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
+       0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
+       0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
+       0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
+       0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
+       0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
+       0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
+       0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
+       0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
+       0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
+       0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
+       0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
+       0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
+       0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
+       0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
+       0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
+       0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
+       0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
+       0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
+       0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
+       0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
+       0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
+       0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
+       0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
+       0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
+       0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
+       0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
+       0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
+       0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
 };
 static const u32 Te3[256] = {
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
+       0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
+       0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
+       0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
+       0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
+       0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
+       0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
+       0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
+       0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
+       0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
+       0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
+       0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
+       0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
+       0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
+       0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
+       0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
+       0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
+       0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
+       0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
+       0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
+       0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
+       0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
+       0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
+       0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
+       0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
+       0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
+       0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
+       0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
+       0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
+       0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
+       0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
+       0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
+       0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
+       0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
+       0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
+       0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
+       0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
+       0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
+       0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
+       0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
+       0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
+       0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
+       0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
+       0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
+       0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
+       0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
+       0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
+       0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
+       0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
+       0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
+       0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
+       0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
+       0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
+       0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
+       0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
+       0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
+       0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
+       0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
+       0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
+       0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
+       0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
+       0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
+       0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
+       0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
+       0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
 };
 
 static const u32 Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
+       0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
+       0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
+       0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
+       0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
+       0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
+       0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
+       0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
+       0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
+       0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
+       0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
+       0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
+       0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
+       0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
+       0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
+       0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
+       0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
+       0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
+       0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
+       0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
+       0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
+       0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
+       0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
+       0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
+       0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
+       0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
+       0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
+       0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
+       0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
+       0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
+       0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
+       0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
+       0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
+       0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
+       0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
+       0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
+       0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
+       0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
+       0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
+       0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
+       0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
+       0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
+       0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
+       0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
+       0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
+       0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
+       0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
+       0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
+       0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
+       0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
+       0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
+       0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
+       0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
+       0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
+       0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
+       0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
+       0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
+       0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
+       0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
+       0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
+       0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
+       0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
+       0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
+       0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
+       0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
 };
 static const u32 Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
+       0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
+       0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
+       0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
+       0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
+       0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
+       0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
+       0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
+       0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
+       0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
+       0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
+       0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
+       0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
+       0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
+       0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
+       0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
+       0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
+       0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
+       0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
+       0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
+       0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
+       0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
+       0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
+       0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
+       0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
+       0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
+       0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
+       0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
+       0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
+       0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
+       0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
+       0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
+       0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
+       0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
+       0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
+       0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
+       0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
+       0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
+       0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
+       0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
+       0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
+       0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
+       0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
+       0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
+       0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
+       0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
+       0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
+       0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
+       0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
+       0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
+       0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
+       0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
+       0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
+       0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
+       0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
+       0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
+       0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
+       0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
+       0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
+       0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
+       0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
+       0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
+       0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
+       0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
+       0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
 };
 static const u32 Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
+       0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
+       0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
+       0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
+       0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
+       0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
+       0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
+       0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
+       0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
+       0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
+       0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
+       0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
+       0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
+       0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
+       0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
+       0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
+       0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
+       0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
+       0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
+       0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
+       0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
+       0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
+       0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
+       0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
+       0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
+       0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
+       0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
+       0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
+       0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
+       0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
+       0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
+       0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
+       0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
+       0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
+       0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
+       0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
+       0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
+       0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
+       0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
+       0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
+       0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
+       0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
+       0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
+       0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
+       0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
+       0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
+       0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
+       0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
+       0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
+       0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
+       0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
+       0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
+       0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
+       0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
+       0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
+       0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
+       0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
+       0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
+       0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
+       0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
+       0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
+       0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
+       0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
+       0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
+       0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
 };
 static const u32 Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
+       0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
+       0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
+       0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
+       0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
+       0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
+       0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
+       0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
+       0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
+       0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
+       0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
+       0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
+       0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
+       0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
+       0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
+       0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
+       0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
+       0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
+       0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
+       0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
+       0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
+       0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
+       0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
+       0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
+       0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
+       0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
+       0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
+       0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
+       0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
+       0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
+       0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
+       0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
+       0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
+       0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
+       0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
+       0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
+       0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
+       0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
+       0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
+       0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
+       0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
+       0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
+       0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
+       0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
+       0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
+       0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
+       0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
+       0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
+       0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
+       0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
+       0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
+       0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
+       0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
+       0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
+       0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
+       0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
+       0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
+       0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
+       0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
+       0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
+       0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
+       0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
+       0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
+       0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
+       0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
 };
 static const u8 Td4[256] = {
-    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
-    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
-    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
-    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
-    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
-    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
-    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
-    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
-    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
-    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
-    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
-    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
-    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
-    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
-    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
-    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
-    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
-    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
-    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
-    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
-    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
-    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
-    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
-    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
-    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
-    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
-    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
-    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
-    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
-    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
-    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
-    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
+       0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
+       0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
+       0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
+       0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
+       0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
+       0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
+       0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
+       0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
+       0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
+       0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
+       0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
+       0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
+       0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
+       0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
+       0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
+       0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
+       0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
+       0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
+       0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
+       0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
+       0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
+       0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
+       0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
+       0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
+       0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
+       0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
+       0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
+       0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
+       0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
+       0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
+       0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
+       0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
 };
 static const u32 rcon[] = {
        0x01000000, 0x02000000, 0x04000000, 0x08000000,
@@ -625,11 +625,12 @@ static const u32 rcon[] = {
 /**
  * Expand the cipher key into the encryption key schedule.
  */
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key) {
-
+int
+private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
        u32 *rk;
-       int i = 0;
+       int i = 0;
        u32 temp;
 
        if (!userKey || !key)
@@ -639,26 +640,26 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 
        rk = key->rd_key;
 
-       if (bits==128)
+       if (bits == 128)
                key->rounds = 10;
-       else if (bits==192)
+       else if (bits == 192)
                key->rounds = 12;
        else
                key->rounds = 14;
 
-       rk[0] = GETU32(userKey     );
-       rk[1] = GETU32(userKey +  4);
-       rk[2] = GETU32(userKey +  8);
+       rk[0] = GETU32(userKey);
+       rk[1] = GETU32(userKey + 4);
+       rk[2] = GETU32(userKey + 8);
        rk[3] = GETU32(userKey + 12);
        if (bits == 128) {
                while (1) {
-                       temp  = rk[3];
+                       temp = rk[3];
                        rk[4] = rk[0] ^
-                               (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                               (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                               (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                               (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                               rcon[i];
+                           (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+                           (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
+                           (Te0[(temp) & 0xff] & 0x0000ff00) ^
+                           (Te1[(temp >> 24)] & 0x000000ff) ^
+                           rcon[i];
                        rk[5] = rk[1] ^ rk[4];
                        rk[6] = rk[2] ^ rk[5];
                        rk[7] = rk[3] ^ rk[6];
@@ -672,21 +673,21 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[5] = GETU32(userKey + 20);
        if (bits == 192) {
                while (1) {
-                       temp = rk[ 5];
-                       rk[ 6] = rk[ 0] ^
-                               (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                               (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                               (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                               (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                               rcon[i];
-                       rk[ 7] = rk[ 1] ^ rk[ 6];
-                       rk[ 8] = rk[ 2] ^ rk[ 7];
-                       rk[ 9] = rk[ 3] ^ rk[ 8];
+                       temp = rk[5];
+                       rk[6] = rk[ 0] ^
+                           (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+                           (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
+                           (Te0[(temp) & 0xff] & 0x0000ff00) ^
+                           (Te1[(temp >> 24)] & 0x000000ff) ^
+                           rcon[i];
+                       rk[7] = rk[1] ^ rk[6];
+                       rk[8] = rk[2] ^ rk[7];
+                       rk[9] = rk[3] ^ rk[8];
                        if (++i == 8) {
                                return 0;
                        }
-                       rk[10] = rk[ 4] ^ rk[ 9];
-                       rk[11] = rk[ 5] ^ rk[10];
+                       rk[10] = rk[4] ^ rk[9];
+                       rk[11] = rk[5] ^ rk[10];
                        rk += 6;
                }
        }
@@ -694,31 +695,31 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[7] = GETU32(userKey + 28);
        if (bits == 256) {
                while (1) {
-                       temp = rk[ 7];
-                       rk[ 8] = rk[ 0] ^
-                               (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                               (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                               (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                               (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                               rcon[i];
-                       rk[ 9] = rk[ 1] ^ rk[ 8];
-                       rk[10] = rk[ 2] ^ rk[ 9];
-                       rk[11] = rk[ 3] ^ rk[10];
+                       temp = rk[7];
+                       rk[8] = rk[0] ^
+                           (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+                           (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
+                           (Te0[(temp) & 0xff] & 0x0000ff00) ^
+                           (Te1[(temp >> 24)] & 0x000000ff) ^
+                           rcon[i];
+                       rk[9] = rk[1] ^ rk[8];
+                       rk[10] = rk[2] ^ rk[9];
+                       rk[11] = rk[3] ^ rk[10];
                        if (++i == 7) {
                                return 0;
                        }
                        temp = rk[11];
-                       rk[12] = rk[ 4] ^
-                               (Te2[(temp >> 24)       ] & 0xff000000) ^
-                               (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
-                               (Te0[(temp >>  8) & 0xff] & 0x0000ff00) ^
-                               (Te1[(temp      ) & 0xff] & 0x000000ff);
-                       rk[13] = rk[ 5] ^ rk[12];
-                       rk[14] = rk[ 6] ^ rk[13];
-                       rk[15] = rk[ 7] ^ rk[14];
+                       rk[12] = rk[4] ^
+                           (Te2[(temp >> 24)] & 0xff000000) ^
+                           (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
+                           (Te0[(temp >> 8) & 0xff] & 0x0000ff00) ^
+                           (Te1[(temp) & 0xff] & 0x000000ff);
+                       rk[13] = rk[5] ^ rk[12];
+                       rk[14] = rk[6] ^ rk[13];
+                       rk[15] = rk[7] ^ rk[14];
 
                        rk += 8;
-               }
+               }
        }
        return 0;
 }
@@ -726,10 +727,11 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 /**
  * Expand the cipher key into the decryption key schedule.
  */
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key) {
-
-        u32 *rk;
+int
+private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
+       u32 *rk;
        int i, j, status;
        u32 temp;
 
@@ -741,35 +743,43 @@ int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
        rk = key->rd_key;
 
        /* invert the order of the round keys: */
-       for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-               temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-               temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-               temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-               temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+       for (i = 0, j = 4 * (key->rounds); i < j; i += 4, j -= 4) {
+               temp = rk[i];
+               rk[i] = rk[j];
+               rk[j] = temp;
+               temp = rk[i + 1];
+               rk[i + 1] = rk[j + 1];
+               rk[j + 1] = temp;
+               temp = rk[i + 2];
+               rk[i + 2] = rk[j + 2];
+               rk[j + 2] = temp;
+               temp = rk[i + 3];
+               rk[i + 3] = rk[j + 3];
+               rk[j + 3] = temp;
        }
        /* apply the inverse MixColumn transform to all round keys but the first and the last: */
        for (i = 1; i < (key->rounds); i++) {
                rk += 4;
                rk[0] =
-                       Td0[Te1[(rk[0] >> 24)       ] & 0xff] ^
-                       Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
-                       Td2[Te1[(rk[0] >>  8) & 0xff] & 0xff] ^
-                       Td3[Te1[(rk[0]      ) & 0xff] & 0xff];
+                   Td0[Te1[(rk[0] >> 24)] & 0xff] ^
+                   Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
+                   Td2[Te1[(rk[0] >> 8) & 0xff] & 0xff] ^
+                   Td3[Te1[(rk[0]) & 0xff] & 0xff];
                rk[1] =
-                       Td0[Te1[(rk[1] >> 24)       ] & 0xff] ^
-                       Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
-                       Td2[Te1[(rk[1] >>  8) & 0xff] & 0xff] ^
-                       Td3[Te1[(rk[1]      ) & 0xff] & 0xff];
+                   Td0[Te1[(rk[1] >> 24)] & 0xff] ^
+                   Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
+                   Td2[Te1[(rk[1] >> 8) & 0xff] & 0xff] ^
+                   Td3[Te1[(rk[1]) & 0xff] & 0xff];
                rk[2] =
-                       Td0[Te1[(rk[2] >> 24)       ] & 0xff] ^
-                       Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
-                       Td2[Te1[(rk[2] >>  8) & 0xff] & 0xff] ^
-                       Td3[Te1[(rk[2]      ) & 0xff] & 0xff];
+                   Td0[Te1[(rk[2] >> 24)] & 0xff] ^
+                   Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
+                   Td2[Te1[(rk[2] >> 8) & 0xff] & 0xff] ^
+                   Td3[Te1[(rk[2]) & 0xff] & 0xff];
                rk[3] =
-                       Td0[Te1[(rk[3] >> 24)       ] & 0xff] ^
-                       Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
-                       Td2[Te1[(rk[3] >>  8) & 0xff] & 0xff] ^
-                       Td3[Te1[(rk[3]      ) & 0xff] & 0xff];
+                   Td0[Te1[(rk[3] >> 24)] & 0xff] ^
+                   Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
+                   Td2[Te1[(rk[3] >> 8) & 0xff] & 0xff] ^
+                   Td3[Te1[(rk[3]) & 0xff] & 0xff];
        }
        return 0;
 }
@@ -778,9 +788,9 @@ int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
  * Encrypt a single block
  * in and out can overlap
  */
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-                const AES_KEY *key) {
-
+void
+AES_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
+{
        const u32 *rk;
        u32 s0, s1, s2, s3, t0, t1, t2, t3;
 #ifndef FULL_UNROLL
@@ -800,168 +810,168 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
        s3 = GETU32(in + 12) ^ rk[3];
 #ifdef FULL_UNROLL
        /* round 1: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
-       /* round 2: */
-       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
-       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
-       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
-       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
+       /* round 2: */
+       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
+       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
+       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
+       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
        /* round 3: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
-       /* round 4: */
-       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
-       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
-       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
-       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
+       /* round 4: */
+       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
+       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
+       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
+       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
        /* round 5: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
-       /* round 6: */
-       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
-       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
-       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
-       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
+       /* round 6: */
+       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
+       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
+       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
+       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
        /* round 7: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
-       /* round 8: */
-       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
-       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
-       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
-       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
+       /* round 8: */
+       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
+       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
+       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
+       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
        /* round 9: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
-            s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
-            s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
-            s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
-            t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
-            t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
-            t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
-        }
-    }
-    rk += key->rounds << 2;
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
+       if (key->rounds > 10) {
+               /* round 10: */
+               s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
+               s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
+               s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
+               s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
+               /* round 11: */
+               t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
+               t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
+               t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
+               t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
+               if (key->rounds > 12) {
+                       /* round 12: */
+                       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
+                       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
+                       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
+                       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
+                       /* round 13: */
+                       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
+                       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
+                       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
+                       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
+               }
+       }
+       rk += key->rounds << 2;
 #else  /* !FULL_UNROLL */
     /*
      * Nr - 1 full rounds:
      */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Te0[(s0 >> 24)       ] ^
-            Te1[(s1 >> 16) & 0xff] ^
-            Te2[(s2 >>  8) & 0xff] ^
-            Te3[(s3      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Te0[(s1 >> 24)       ] ^
-            Te1[(s2 >> 16) & 0xff] ^
-            Te2[(s3 >>  8) & 0xff] ^
-            Te3[(s0      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Te0[(s2 >> 24)       ] ^
-            Te1[(s3 >> 16) & 0xff] ^
-            Te2[(s0 >>  8) & 0xff] ^
-            Te3[(s1      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Te0[(s3 >> 24)       ] ^
-            Te1[(s0 >> 16) & 0xff] ^
-            Te2[(s1 >>  8) & 0xff] ^
-            Te3[(s2      ) & 0xff] ^
-            rk[7];
+       r = key->rounds >> 1;
+       for (;;) {
+               t0 =
+                   Te0[(s0 >> 24)] ^
+                   Te1[(s1 >> 16) & 0xff] ^
+                   Te2[(s2 >> 8) & 0xff] ^
+                   Te3[(s3) & 0xff] ^
+                   rk[4];
+               t1 =
+                   Te0[(s1 >> 24)] ^
+                   Te1[(s2 >> 16) & 0xff] ^
+                   Te2[(s3 >> 8) & 0xff] ^
+                   Te3[(s0) & 0xff] ^
+                   rk[5];
+               t2 =
+                   Te0[(s2 >> 24)] ^
+                   Te1[(s3 >> 16) & 0xff] ^
+                   Te2[(s0 >> 8) & 0xff] ^
+                   Te3[(s1) & 0xff] ^
+                   rk[6];
+               t3 =
+                   Te0[(s3 >> 24)] ^
+                   Te1[(s0 >> 16) & 0xff] ^
+                   Te2[(s1 >> 8) & 0xff] ^
+                   Te3[(s2) & 0xff] ^
+                   rk[7];
 
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
+               rk += 8;
+               if (--r == 0) {
+                       break;
+               }
 
-        s0 =
-            Te0[(t0 >> 24)       ] ^
-            Te1[(t1 >> 16) & 0xff] ^
-            Te2[(t2 >>  8) & 0xff] ^
-            Te3[(t3      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Te0[(t1 >> 24)       ] ^
-            Te1[(t2 >> 16) & 0xff] ^
-            Te2[(t3 >>  8) & 0xff] ^
-            Te3[(t0      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Te0[(t2 >> 24)       ] ^
-            Te1[(t3 >> 16) & 0xff] ^
-            Te2[(t0 >>  8) & 0xff] ^
-            Te3[(t1      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Te0[(t3 >> 24)       ] ^
-            Te1[(t0 >> 16) & 0xff] ^
-            Te2[(t1 >>  8) & 0xff] ^
-            Te3[(t2      ) & 0xff] ^
-            rk[3];
-    }
+               s0 =
+                   Te0[(t0 >> 24)] ^
+                   Te1[(t1 >> 16) & 0xff] ^
+                   Te2[(t2 >> 8) & 0xff] ^
+                   Te3[(t3) & 0xff] ^
+                   rk[0];
+               s1 =
+                   Te0[(t1 >> 24)] ^
+                   Te1[(t2 >> 16) & 0xff] ^
+                   Te2[(t3 >> 8) & 0xff] ^
+                   Te3[(t0) & 0xff] ^
+                   rk[1];
+               s2 =
+                   Te0[(t2 >> 24)] ^
+                   Te1[(t3 >> 16) & 0xff] ^
+                   Te2[(t0 >> 8) & 0xff] ^
+                   Te3[(t1) & 0xff] ^
+                   rk[2];
+               s3 =
+                   Te0[(t3 >> 24)] ^
+                   Te1[(t0 >> 16) & 0xff] ^
+                   Te2[(t1 >> 8) & 0xff] ^
+                   Te3[(t2) & 0xff] ^
+                   rk[3];
+       }
 #endif /* ?FULL_UNROLL */
-    /*
+       /*
         * apply last round and
         * map cipher state to byte array block:
         */
        s0 =
-               (Te2[(t0 >> 24)       ] & 0xff000000) ^
-               (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-               (Te0[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-               (Te1[(t3      ) & 0xff] & 0x000000ff) ^
-               rk[0];
-       PUTU32(out     , s0);
+           (Te2[(t0 >> 24)] & 0xff000000) ^
+           (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
+           (Te0[(t2 >> 8) & 0xff] & 0x0000ff00) ^
+           (Te1[(t3) & 0xff] & 0x000000ff) ^
+           rk[0];
+       PUTU32(out, s0);
        s1 =
-               (Te2[(t1 >> 24)       ] & 0xff000000) ^
-               (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-               (Te0[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-               (Te1[(t0      ) & 0xff] & 0x000000ff) ^
-               rk[1];
+           (Te2[(t1 >> 24)] & 0xff000000) ^
+           (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
+           (Te0[(t3 >> 8) & 0xff] & 0x0000ff00) ^
+           (Te1[(t0) & 0xff] & 0x000000ff) ^
+           rk[1];
        PUTU32(out +  4, s1);
        s2 =
-               (Te2[(t2 >> 24)       ] & 0xff000000) ^
-               (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-               (Te0[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-               (Te1[(t1      ) & 0xff] & 0x000000ff) ^
-               rk[2];
+           (Te2[(t2 >> 24)] & 0xff000000) ^
+           (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
+           (Te0[(t0 >> 8) & 0xff] & 0x0000ff00) ^
+           (Te1[(t1) & 0xff] & 0x000000ff) ^
+           rk[2];
        PUTU32(out +  8, s2);
        s3 =
-               (Te2[(t3 >> 24)       ] & 0xff000000) ^
-               (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-               (Te0[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-               (Te1[(t2      ) & 0xff] & 0x000000ff) ^
-               rk[3];
+           (Te2[(t3 >> 24)] & 0xff000000) ^
+           (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
+           (Te0[(t1 >> 8) & 0xff] & 0x0000ff00) ^
+           (Te1[(t2) & 0xff] & 0x000000ff) ^
+           rk[3];
        PUTU32(out + 12, s3);
 }
 
@@ -969,9 +979,9 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
  * Decrypt a single block
  * in and out can overlap
  */
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-                const AES_KEY *key) {
-
+void
+AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
+{
        const u32 *rk;
        u32 s0, s1, s2, s3, t0, t1, t2, t3;
 #ifndef FULL_UNROLL
@@ -985,226 +995,229 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
         * map byte array block to cipher state
         * and add initial round key:
         */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
-    s3 = GETU32(in + 12) ^ rk[3];
+       s0 = GETU32(in) ^ rk[0];
+       s1 = GETU32(in + 4) ^ rk[1];
+       s2 = GETU32(in + 8) ^ rk[2];
+       s3 = GETU32(in + 12) ^ rk[3];
 #ifdef FULL_UNROLL
-    /* round 1: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
-    /* round 2: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
-    /* round 3: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
-    /* round 4: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
-    /* round 5: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
-    /* round 6: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
-    /* round 7: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
-    /* round 8: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
-    /* round 9: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
-        s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
-        s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
-        s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
-        t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
-        t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
-        t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
-            s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
-            s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
-            s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
-            t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
-            t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
-            t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
-        }
-    }
+       /* round 1: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
+       /* round 2: */
+       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
+       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
+       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
+       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
+       /* round 3: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
+       /* round 4: */
+       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
+       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
+       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
+       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
+       /* round 5: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
+       /* round 6: */
+       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
+       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
+       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
+       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
+       /* round 7: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
+       /* round 8: */
+       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
+       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
+       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
+       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
+       /* round 9: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
+       if (key->rounds > 10) {
+               /* round 10: */
+               s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
+               s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
+               s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
+               s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
+               /* round 11: */
+               t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
+               t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
+               t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
+               t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
+               if (key->rounds > 12) {
+                       /* round 12: */
+                       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
+                       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
+                       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
+                       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
+                       /* round 13: */
+                       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
+                       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
+                       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
+                       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
+               }
+       }
        rk += key->rounds << 2;
 #else  /* !FULL_UNROLL */
     /*
      * Nr - 1 full rounds:
      */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Td0[(s0 >> 24)       ] ^
-            Td1[(s3 >> 16) & 0xff] ^
-            Td2[(s2 >>  8) & 0xff] ^
-            Td3[(s1      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Td0[(s1 >> 24)       ] ^
-            Td1[(s0 >> 16) & 0xff] ^
-            Td2[(s3 >>  8) & 0xff] ^
-            Td3[(s2      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Td0[(s2 >> 24)       ] ^
-            Td1[(s1 >> 16) & 0xff] ^
-            Td2[(s0 >>  8) & 0xff] ^
-            Td3[(s3      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Td0[(s3 >> 24)       ] ^
-            Td1[(s2 >> 16) & 0xff] ^
-            Td2[(s1 >>  8) & 0xff] ^
-            Td3[(s0      ) & 0xff] ^
-            rk[7];
+       r = key->rounds >> 1;
+       for (;;) {
+               t0 =
+                   Td0[(s0 >> 24)] ^
+                   Td1[(s3 >> 16) & 0xff] ^
+                   Td2[(s2 >> 8) & 0xff] ^
+                   Td3[(s1) & 0xff] ^
+                   rk[4];
+               t1 =
+                   Td0[(s1 >> 24)] ^
+                   Td1[(s0 >> 16) & 0xff] ^
+                   Td2[(s3 >> 8) & 0xff] ^
+                   Td3[(s2) & 0xff] ^
+                   rk[5];
+               t2 =
+                   Td0[(s2 >> 24)] ^
+                   Td1[(s1 >> 16) & 0xff] ^
+                   Td2[(s0 >> 8) & 0xff] ^
+                   Td3[(s3) & 0xff] ^
+                   rk[6];
+               t3 =
+                   Td0[(s3 >> 24)] ^
+                   Td1[(s2 >> 16) & 0xff] ^
+                   Td2[(s1 >> 8) & 0xff] ^
+                   Td3[(s0) & 0xff] ^
+                   rk[7];
 
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
+               rk += 8;
+               if (--r == 0) {
+                       break;
+               }
 
-        s0 =
-            Td0[(t0 >> 24)       ] ^
-            Td1[(t3 >> 16) & 0xff] ^
-            Td2[(t2 >>  8) & 0xff] ^
-            Td3[(t1      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Td0[(t1 >> 24)       ] ^
-            Td1[(t0 >> 16) & 0xff] ^
-            Td2[(t3 >>  8) & 0xff] ^
-            Td3[(t2      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Td0[(t2 >> 24)       ] ^
-            Td1[(t1 >> 16) & 0xff] ^
-            Td2[(t0 >>  8) & 0xff] ^
-            Td3[(t3      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Td0[(t3 >> 24)       ] ^
-            Td1[(t2 >> 16) & 0xff] ^
-            Td2[(t1 >>  8) & 0xff] ^
-            Td3[(t0      ) & 0xff] ^
-            rk[3];
-    }
+               s0 =
+                   Td0[(t0 >> 24)] ^
+                   Td1[(t3 >> 16) & 0xff] ^
+                   Td2[(t2 >> 8) & 0xff] ^
+                   Td3[(t1) & 0xff] ^
+                   rk[0];
+               s1 =
+                   Td0[(t1 >> 24)] ^
+                   Td1[(t0 >> 16) & 0xff] ^
+                   Td2[(t3 >> 8) & 0xff] ^
+                   Td3[(t2) & 0xff] ^
+                   rk[1];
+               s2 =
+                   Td0[(t2 >> 24)] ^
+                   Td1[(t1 >> 16) & 0xff] ^
+                   Td2[(t0 >> 8) & 0xff] ^
+                   Td3[(t3) & 0xff] ^
+                   rk[2];
+               s3 =
+                   Td0[(t3 >> 24)] ^
+                   Td1[(t2 >> 16) & 0xff] ^
+                   Td2[(t1 >> 8) & 0xff] ^
+                   Td3[(t0) & 0xff] ^
+                   rk[3];
+       }
 #endif /* ?FULL_UNROLL */
     /*
         * apply last round and
         * map cipher state to byte array block:
         */
-       s0 =
-               (Td4[(t0 >> 24)       ] << 24) ^
-               (Td4[(t3 >> 16) & 0xff] << 16) ^
-               (Td4[(t2 >>  8) & 0xff] <<  8) ^
-               (Td4[(t1      ) & 0xff])       ^
-               rk[0];
-       PUTU32(out     , s0);
-       s1 =
-               (Td4[(t1 >> 24)       ] << 24) ^
-               (Td4[(t0 >> 16) & 0xff] << 16) ^
-               (Td4[(t3 >>  8) & 0xff] <<  8) ^
-               (Td4[(t2      ) & 0xff])       ^
-               rk[1];
-       PUTU32(out +  4, s1);
-       s2 =
-               (Td4[(t2 >> 24)       ] << 24) ^
-               (Td4[(t1 >> 16) & 0xff] << 16) ^
-               (Td4[(t0 >>  8) & 0xff] <<  8) ^
-               (Td4[(t3      ) & 0xff])       ^
-               rk[2];
-       PUTU32(out +  8, s2);
-       s3 =
-               (Td4[(t3 >> 24)       ] << 24) ^
-               (Td4[(t2 >> 16) & 0xff] << 16) ^
-               (Td4[(t1 >>  8) & 0xff] <<  8) ^
-               (Td4[(t0      ) & 0xff])       ^
-               rk[3];
+       s0 =
+           (Td4[(t0 >> 24)] << 24) ^
+           (Td4[(t3 >> 16) & 0xff] << 16) ^
+           (Td4[(t2 >> 8) & 0xff] <<  8) ^
+           (Td4[(t1) & 0xff]) ^
+           rk[0];
+       PUTU32(out, s0);
+       s1 =
+           (Td4[(t1 >> 24)] << 24) ^
+           (Td4[(t0 >> 16) & 0xff] << 16) ^
+           (Td4[(t3 >> 8) & 0xff] <<  8) ^
+           (Td4[(t2) & 0xff]) ^
+           rk[1];
+       PUTU32(out + 4, s1);
+       s2 =
+           (Td4[(t2 >> 24)] << 24) ^
+           (Td4[(t1 >> 16) & 0xff] << 16) ^
+           (Td4[(t0 >> 8) & 0xff] <<  8) ^
+           (Td4[(t3) & 0xff]) ^
+           rk[2];
+       PUTU32(out + 8, s2);
+       s3 =
+           (Td4[(t3 >> 24)] << 24) ^
+           (Td4[(t2 >> 16) & 0xff] << 16) ^
+           (Td4[(t1 >> 8) & 0xff] <<  8) ^
+           (Td4[(t0) & 0xff]) ^
+           rk[3];
        PUTU32(out + 12, s3);
 }
 
 #else /* AES_ASM */
 
 static const u8 Te4[256] = {
-    0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
-    0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
-    0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
-    0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
-    0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
-    0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
-    0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
-    0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
-    0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
-    0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
-    0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
-    0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
-    0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
-    0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
-    0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
-    0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
-    0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
-    0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
-    0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
-    0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
-    0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
-    0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
-    0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
-    0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
-    0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
-    0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
-    0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
-    0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
-    0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
-    0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
-    0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
-    0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
+       0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
+       0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
+       0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
+       0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
+       0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
+       0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
+       0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
+       0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
+       0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
+       0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
+       0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
+       0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
+       0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
+       0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
+       0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
+       0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
+       0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
+       0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
+       0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
+       0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
+       0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
+       0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
+       0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
+       0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
+       0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
+       0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
+       0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
+       0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
+       0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
+       0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
+       0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
+       0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
 };
 static const u32 rcon[] = {
        0x01000000, 0x02000000, 0x04000000, 0x08000000,
        0x10000000, 0x20000000, 0x40000000, 0x80000000,
-       0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+       0x1B000000, 0x36000000,
+       /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
 };
 
 /**
  * Expand the cipher key into the encryption key schedule.
  */
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key) {
+int
+private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
        u32 *rk;
-       int i = 0;
+       int i = 0;
        u32 temp;
 
        if (!userKey || !key)
@@ -1214,26 +1227,26 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 
        rk = key->rd_key;
 
-       if (bits==128)
+       if (bits == 128)
                key->rounds = 10;
-       else if (bits==192)
+       else if (bits == 192)
                key->rounds = 12;
        else
                key->rounds = 14;
 
-       rk[0] = GETU32(userKey     );
+       rk[0] = GETU32(userKey);
        rk[1] = GETU32(userKey +  4);
        rk[2] = GETU32(userKey +  8);
        rk[3] = GETU32(userKey + 12);
        if (bits == 128) {
                while (1) {
-                       temp  = rk[3];
+                       temp = rk[3];
                        rk[4] = rk[0] ^
-                               (Te4[(temp >> 16) & 0xff] << 24) ^
-                               (Te4[(temp >>  8) & 0xff] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 8) ^
-                               (Te4[(temp >> 24)       ]) ^
-                               rcon[i];
+                           (Te4[(temp >> 16) & 0xff] << 24) ^
+                           (Te4[(temp >> 8) & 0xff] << 16) ^
+                           (Te4[(temp) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)]) ^
+                           rcon[i];
                        rk[5] = rk[1] ^ rk[4];
                        rk[6] = rk[2] ^ rk[5];
                        rk[7] = rk[3] ^ rk[6];
@@ -1247,21 +1260,21 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[5] = GETU32(userKey + 20);
        if (bits == 192) {
                while (1) {
-                       temp = rk[ 5];
-                       rk[ 6] = rk[ 0] ^
-                               (Te4[(temp >> 16) & 0xff] << 24) ^
-                               (Te4[(temp >>  8) & 0xff] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 8) ^
-                               (Te4[(temp >> 24)       ]) ^
-                               rcon[i];
-                       rk[ 7] = rk[ 1] ^ rk[ 6];
-                       rk[ 8] = rk[ 2] ^ rk[ 7];
-                       rk[ 9] = rk[ 3] ^ rk[ 8];
+                       temp = rk[5];
+                       rk[6] = rk[0] ^
+                           (Te4[(temp >> 16) & 0xff] << 24) ^
+                           (Te4[(temp >> 8) & 0xff] << 16) ^
+                           (Te4[(temp) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)]) ^
+                           rcon[i];
+                       rk[7] = rk[1] ^ rk[6];
+                       rk[8] = rk[2] ^ rk[7];
+                       rk[9] = rk[3] ^ rk[8];
                        if (++i == 8) {
                                return 0;
                        }
-                       rk[10] = rk[ 4] ^ rk[ 9];
-                       rk[11] = rk[ 5] ^ rk[10];
+                       rk[10] = rk[4] ^ rk[9];
+                       rk[11] = rk[5] ^ rk[10];
                        rk += 6;
                }
        }
@@ -1269,31 +1282,31 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[7] = GETU32(userKey + 28);
        if (bits == 256) {
                while (1) {
-                       temp = rk[ 7];
-                       rk[ 8] = rk[ 0] ^
-                               (Te4[(temp >> 16) & 0xff] << 24) ^
-                               (Te4[(temp >>  8) & 0xff] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 8) ^
-                               (Te4[(temp >> 24)       ]) ^
-                               rcon[i];
-                       rk[ 9] = rk[ 1] ^ rk[ 8];
-                       rk[10] = rk[ 2] ^ rk[ 9];
-                       rk[11] = rk[ 3] ^ rk[10];
+                       temp = rk[7];
+                       rk[8] = rk[0] ^
+                           (Te4[(temp >> 16) & 0xff] << 24) ^
+                           (Te4[(temp >> 8) & 0xff] << 16) ^
+                           (Te4[(temp) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)]) ^
+                           rcon[i];
+                       rk[9] = rk[1] ^ rk[8];
+                       rk[10] = rk[2] ^ rk[9];
+                       rk[11] = rk[3] ^ rk[10];
                        if (++i == 7) {
                                return 0;
                        }
                        temp = rk[11];
-                       rk[12] = rk[ 4] ^
-                               (Te4[(temp >> 24)       ] << 24) ^
-                               (Te4[(temp >> 16) & 0xff] << 16) ^
-                               (Te4[(temp >>  8) & 0xff] << 8) ^
-                               (Te4[(temp      ) & 0xff]);
-                       rk[13] = rk[ 5] ^ rk[12];
-                       rk[14] = rk[ 6] ^ rk[13];
-                       rk[15] = rk[ 7] ^ rk[14];
+                       rk[12] = rk[4] ^
+                           (Te4[(temp >> 24)] << 24) ^
+                           (Te4[(temp >> 16) & 0xff] << 16) ^
+                           (Te4[(temp >> 8) & 0xff] << 8) ^
+                           (Te4[(temp) & 0xff]);
+                       rk[13] = rk[5] ^ rk[12];
+                       rk[14] = rk[6] ^ rk[13];
+                       rk[15] = rk[7] ^ rk[14];
 
                        rk += 8;
-               }
+               }
        }
        return 0;
 }
@@ -1301,10 +1314,11 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 /**
  * Expand the cipher key into the decryption key schedule.
  */
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key) {
-
-        u32 *rk;
+int
+private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
+       u32 *rk;
        int i, j, status;
        u32 temp;
 
@@ -1317,10 +1331,18 @@ int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
 
        /* invert the order of the round keys: */
        for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-               temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-               temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-               temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-               temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+               temp = rk[i];
+               rk[i] = rk[j];
+               rk[j] = temp;
+               temp = rk[i + 1];
+               rk[i + 1] = rk[j + 1];
+               rk[j + 1] = temp;
+               temp = rk[i + 2];
+               rk[i + 2] = rk[j + 2];
+               rk[j + 2] = temp;
+               temp = rk[i + 3];
+               rk[i + 3] = rk[j + 3];
+               rk[j + 3] = temp;
        }
        /* apply the inverse MixColumn transform to all round keys but the first and the last: */
        for (i = 1; i < (key->rounds); i++) {
@@ -1331,24 +1353,24 @@ int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
                        tp1 = rk[j];
                        m = tp1 & 0x80808080;
                        tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp2 & 0x80808080;
                        tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp4 & 0x80808080;
                        tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        tp9 = tp8 ^ tp1;
                        tpb = tp9 ^ tp2;
                        tpd = tp9 ^ tp4;
                        tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-                       rk[j] = tpe ^ ROTATE(tpd,16) ^
-                               ROTATE(tp9,24) ^ ROTATE(tpb,8);
+                       rk[j] = tpe ^ ROTATE(tpd, 16) ^
+                           ROTATE(tp9, 24) ^ ROTATE(tpb, 8);
 #else
-                       rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-                               (tp9 >> 8) ^ (tp9 << 24) ^
-                               (tpb >> 24) ^ (tpb << 8);
+                       rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
+                           (tp9 >> 8) ^ (tp9 << 24) ^
+                           (tpb >> 24) ^ (tpb << 8);
 #endif
                }
        }
index 7c9d165..663b5a1 100644 (file)
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 
-void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const AES_KEY *key,
-                       unsigned char ivec[AES_BLOCK_SIZE],
-                       unsigned char ecount_buf[AES_BLOCK_SIZE],
-                       unsigned int *num) {
-       CRYPTO_ctr128_encrypt(in,out,length,key,ivec,ecount_buf,num,(block128_f)AES_encrypt);
+void
+AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
+    size_t length, const AES_KEY *key, unsigned char ivec[AES_BLOCK_SIZE],
+    unsigned char ecount_buf[AES_BLOCK_SIZE], unsigned int *num)
+{
+       CRYPTO_ctr128_encrypt(in, out, length, key, ivec, ecount_buf, num,
+           (block128_f)AES_encrypt);
 }
index 28aa561..f374a5f 100644 (file)
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
-void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                    const AES_KEY *key, const int enc) {
-
-        assert(in && out && key);
-       assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
+void
+AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
+    const AES_KEY *key, const int enc)
+{
+       assert(in && out && key);
+       assert((AES_ENCRYPT == enc) || (AES_DECRYPT == enc));
 
        if (AES_ENCRYPT == enc)
                AES_encrypt(in, out, key);
        else
                AES_decrypt(in, out, key);
 }
-
index c161351..0882a3d 100644 (file)
@@ -56,7 +56,7 @@
 
 #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long))
 typedef struct {
-        unsigned long data[N_WORDS];
+       unsigned long data[N_WORDS];
 } aes_block_t;
 
 /* XXX: probably some better way to do this */
@@ -76,48 +76,44 @@ typedef struct {
 
 /* N.B. The IV for this mode is _twice_ the block size */
 
-void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                                        size_t length, const AES_KEY *key,
-                                        unsigned char *ivec, const int enc)
-       {
+void
+AES_ige_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, const int enc)
+{
        size_t n;
        size_t len = length;
 
        OPENSSL_assert(in && out && key && ivec);
-       OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
-       OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
+       OPENSSL_assert((AES_ENCRYPT == enc) || (AES_DECRYPT == enc));
+       OPENSSL_assert((length % AES_BLOCK_SIZE) == 0);
 
        len = length / AES_BLOCK_SIZE;
 
-       if (AES_ENCRYPT == enc)
-               {
-               if (in != out &&
-                   (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in|(size_t)out|(size_t)ivec)%sizeof(long)==0))
-                       {
+       if (AES_ENCRYPT == enc) {
+               if (in != out && (UNALIGNED_MEMOPS_ARE_FAST ||
+                   ((size_t)in|(size_t)out|(size_t)ivec) %
+                   sizeof(long) == 0)) {
                        aes_block_t *ivp = (aes_block_t *)ivec;
                        aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
 
-                       while (len)
-                               {
+                       while (len) {
                                aes_block_t *inp = (aes_block_t *)in;
                                aes_block_t *outp = (aes_block_t *)out;
 
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        outp->data[n] = inp->data[n] ^ ivp->data[n];
                                AES_encrypt((unsigned char *)outp->data, (unsigned char *)outp->data, key);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        outp->data[n] ^= iv2p->data[n];
                                ivp = outp;
                                iv2p = inp;
                                --len;
                                in += AES_BLOCK_SIZE;
                                out += AES_BLOCK_SIZE;
-                               }
+                       }
                        memcpy(ivec, ivp->data, AES_BLOCK_SIZE);
                        memcpy(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE);
-                       }
-               else
-                       {
+               } else {
                        aes_block_t tmp, tmp2;
                        aes_block_t iv;
                        aes_block_t iv2;
@@ -125,13 +121,13 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                        load_block(iv, ivec);
                        load_block(iv2, ivec + AES_BLOCK_SIZE);
 
-                       while (len)
-                               {
+                       while (len) {
                                load_block(tmp, in);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp2.data[n] = tmp.data[n] ^ iv.data[n];
-                               AES_encrypt((unsigned char *)tmp2.data, (unsigned char *)tmp2.data, key);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               AES_encrypt((unsigned char *)tmp2.data,
+                                   (unsigned char *)tmp2.data, key);
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp2.data[n] ^= iv2.data[n];
                                store_block(out, tmp2);
                                iv = tmp2;
@@ -139,41 +135,37 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                                --len;
                                in += AES_BLOCK_SIZE;
                                out += AES_BLOCK_SIZE;
-                               }
+                       }
                        memcpy(ivec, iv.data, AES_BLOCK_SIZE);
                        memcpy(ivec + AES_BLOCK_SIZE, iv2.data, AES_BLOCK_SIZE);
-                       }
                }
-       else
-               {
-               if (in != out &&
-                   (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in|(size_t)out|(size_t)ivec)%sizeof(long)==0))
-                       {
+       } else {
+               if (in != out && (UNALIGNED_MEMOPS_ARE_FAST ||
+                   ((size_t)in|(size_t)out|(size_t)ivec) %
+                   sizeof(long) == 0)) {
                        aes_block_t *ivp = (aes_block_t *)ivec;
                        aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
 
-                       while (len)
-                               {
+                       while (len) {
                                aes_block_t tmp;
                                aes_block_t *inp = (aes_block_t *)in;
                                aes_block_t *outp = (aes_block_t *)out;
 
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp.data[n] = inp->data[n] ^ iv2p->data[n];
-                               AES_decrypt((unsigned char *)tmp.data, (unsigned char *)outp->data, key);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               AES_decrypt((unsigned char *)tmp.data,
+                                   (unsigned char *)outp->data, key);
+                               for (n = 0; n < N_WORDS; ++n)
                                        outp->data[n] ^= ivp->data[n];
                                ivp = inp;
                                iv2p = outp;
                                --len;
                                in += AES_BLOCK_SIZE;
                                out += AES_BLOCK_SIZE;
-                               }
+                       }
                        memcpy(ivec, ivp->data, AES_BLOCK_SIZE);
                        memcpy(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE);
-                       }
-               else
-                       {
+               } else {
                        aes_block_t tmp, tmp2;
                        aes_block_t iv;
                        aes_block_t iv2;
@@ -181,14 +173,14 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                        load_block(iv, ivec);
                        load_block(iv2, ivec + AES_BLOCK_SIZE);
 
-                       while (len)
-                               {
+                       while (len) {
                                load_block(tmp, in);
                                tmp2 = tmp;
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp.data[n] ^= iv2.data[n];
-                               AES_decrypt((unsigned char *)tmp.data, (unsigned char *)tmp.data, key);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               AES_decrypt((unsigned char *)tmp.data,
+                                   (unsigned char *)tmp.data, key);
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp.data[n] ^= iv.data[n];
                                store_block(out, tmp);
                                iv = tmp2;
@@ -196,12 +188,12 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                                --len;
                                in += AES_BLOCK_SIZE;
                                out += AES_BLOCK_SIZE;
-                               }
+                       }
                        memcpy(ivec, iv.data, AES_BLOCK_SIZE);
                        memcpy(ivec + AES_BLOCK_SIZE, iv2.data, AES_BLOCK_SIZE);
-                       }
                }
        }
+}
 
 /*
  * Note that its effectively impossible to do biIGE in anything other
@@ -210,11 +202,11 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
 
 /* N.B. The IV for this mode is _four times_ the block size */
 
-void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                                               size_t length, const AES_KEY *key,
-                                               const AES_KEY *key2, const unsigned char *ivec,
-                                               const int enc)
-       {
+void
+AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, const AES_KEY *key2, const unsigned char *ivec,
+    const int enc)
+{
        size_t n;
        size_t len = length;
        unsigned char tmp[AES_BLOCK_SIZE];
@@ -225,23 +217,21 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
        const unsigned char *iv2;
 
        OPENSSL_assert(in && out && key && ivec);
-       OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
-       OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
+       OPENSSL_assert((AES_ENCRYPT == enc) || (AES_DECRYPT == enc));
+       OPENSSL_assert((length % AES_BLOCK_SIZE) == 0);
 
-       if (AES_ENCRYPT == enc)
-               {
+       if (AES_ENCRYPT == enc) {
                /* XXX: Do a separate case for when in != out (strictly should
                   check for overlap, too) */
 
-               /* First the forward pass */ 
+               /* First the forward pass */
                iv = ivec;
                iv2 = ivec + AES_BLOCK_SIZE;
-               while (len >= AES_BLOCK_SIZE)
-                       {
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+               while (len >= AES_BLOCK_SIZE) {
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] = in[n] ^ iv[n];
                        AES_encrypt(out, out, key);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv2[n];
                        iv = out;
                        memcpy(prev, in, AES_BLOCK_SIZE);
@@ -249,68 +239,63 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
                        len -= AES_BLOCK_SIZE;
                        in += AES_BLOCK_SIZE;
                        out += AES_BLOCK_SIZE;
-                       }
+               }
 
                /* And now backwards */
                iv = ivec + AES_BLOCK_SIZE*2;
                iv2 = ivec + AES_BLOCK_SIZE*3;
                len = length;
-               while(len >= AES_BLOCK_SIZE)
-                       {
+               while (len >= AES_BLOCK_SIZE) {
                        out -= AES_BLOCK_SIZE;
                        /* XXX: reduce copies by alternating between buffers */
                        memcpy(tmp, out, AES_BLOCK_SIZE);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv[n];
                        /*                      hexdump(stdout, "out ^ iv", out, AES_BLOCK_SIZE); */
                        AES_encrypt(out, out, key);
                        /*                      hexdump(stdout,"enc", out, AES_BLOCK_SIZE); */
                        /*                      hexdump(stdout,"iv2", iv2, AES_BLOCK_SIZE); */
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv2[n];
                        /*                      hexdump(stdout,"out", out, AES_BLOCK_SIZE); */
                        iv = out;
                        memcpy(prev, tmp, AES_BLOCK_SIZE);
                        iv2 = prev;
                        len -= AES_BLOCK_SIZE;
-                       }
                }
-       else
-               {
+       } else {
                /* First backwards */
                iv = ivec + AES_BLOCK_SIZE*2;
                iv2 = ivec + AES_BLOCK_SIZE*3;
                in += length;
                out += length;
-               while (len >= AES_BLOCK_SIZE)
-                       {
+               while (len >= AES_BLOCK_SIZE) {
                        in -= AES_BLOCK_SIZE;
                        out -= AES_BLOCK_SIZE;
                        memcpy(tmp, in, AES_BLOCK_SIZE);
                        memcpy(tmp2, in, AES_BLOCK_SIZE);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                tmp[n] ^= iv2[n];
                        AES_decrypt(tmp, out, key);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv[n];
                        memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
                        iv = tmp3;
                        iv2 = out;
                        len -= AES_BLOCK_SIZE;
-                       }
+               }
 
                /* And now forwards */
                iv = ivec;
                iv2 = ivec + AES_BLOCK_SIZE;
                len = length;
-               while (len >= AES_BLOCK_SIZE)
-                       {
+               while (len >= AES_BLOCK_SIZE) {
                        memcpy(tmp, out, AES_BLOCK_SIZE);
                        memcpy(tmp2, out, AES_BLOCK_SIZE);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                tmp[n] ^= iv2[n];
                        AES_decrypt(tmp, out, key);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv[n];
                        memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
                        iv = tmp3;
@@ -318,6 +303,6 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
                        len -= AES_BLOCK_SIZE;
                        in += AES_BLOCK_SIZE;
                        out += AES_BLOCK_SIZE;
-                       }
                }
        }
+}
index f083488..d666c06 100644 (file)
 
 const char AES_version[]="AES" OPENSSL_VERSION_PTEXT;
 
-const char *AES_options(void) {
+const char
+*AES_options(void) {
 #ifdef FULL_UNROLL
-        return "aes(full)";
+       return "aes(full)";
 #else   
-        return "aes(partial)";
+       return "aes(partial)";
 #endif
 }
 
 /* FIPS wrapper functions to block low level AES calls in FIPS mode */
 
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key)
-       {
+int
+AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
 #ifdef OPENSSL_FIPS
        fips_cipher_abort(AES);
 #endif
        return private_AES_set_encrypt_key(userKey, bits, key);
-       }
+}
 
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key)
-       {
+int
+AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
 #ifdef OPENSSL_FIPS
        fips_cipher_abort(AES);
 #endif
        return private_AES_set_decrypt_key(userKey, bits, key);
-       }
+}
index 50bf0b8..f5a35b2 100644 (file)
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 
-void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num)
+void
+AES_ofb128_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, int *num)
 {
-       CRYPTO_ofb128_encrypt(in,out,length,key,ivec,num,(block128_f)AES_encrypt);
+       CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
+           (block128_f)AES_encrypt);
 }
index e2d73d3..198b0be 100644 (file)
 #include <openssl/bio.h>
 
 static const unsigned char default_iv[] = {
-  0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+       0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
 };
 
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, unsigned int inlen)
-       {
+int
+AES_wrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen)
+{
        unsigned char *A, B[16], *R;
        unsigned int i, j, t;
        if ((inlen & 0x7) || (inlen < 8))
@@ -75,31 +75,28 @@ int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
 
        memcpy(A, iv, 8);
 
-       for (j = 0; j < 6; j++)
-               {
+       for (j = 0; j < 6; j++) {
                R = out + 8;
-               for (i = 0; i < inlen; i += 8, t++, R += 8)
-                       {
+               for (i = 0; i < inlen; i += 8, t++, R += 8) {
                        memcpy(B + 8, R, 8);
                        AES_encrypt(B, B, key);
                        A[7] ^= (unsigned char)(t & 0xff);
-                       if (t > 0xff)   
-                               {
+                       if (t > 0xff) {
                                A[6] ^= (unsigned char)((t >> 8) & 0xff);
                                A[5] ^= (unsigned char)((t >> 16) & 0xff);
                                A[4] ^= (unsigned char)((t >> 24) & 0xff);
-                               }
-                       memcpy(R, B + 8, 8);
                        }
+                       memcpy(R, B + 8, 8);
                }
+       }
        memcpy(out, A, 8);
        return inlen + 8;
-       }
+}
 
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, unsigned int inlen)
-       {
+int
+AES_unwrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen)
+{
        unsigned char *A, B[16], *R;
        unsigned int i, j, t;
        inlen -= 8;
@@ -108,43 +105,39 @@ int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
        if (inlen < 8)
                return -1;
        A = B;
-       t =  6 * (inlen >> 3);
+       t = 6 * (inlen >> 3);
        memcpy(A, in, 8);
        memcpy(out, in + 8, inlen);
-       for (j = 0; j < 6; j++)
-               {
+       for (j = 0; j < 6; j++) {
                R = out + inlen - 8;
-               for (i = 0; i < inlen; i += 8, t--, R -= 8)
-                       {
+               for (i = 0; i < inlen; i += 8, t--, R -= 8) {
                        A[7] ^= (unsigned char)(t & 0xff);
-                       if (t > 0xff)   
-                               {
+                       if (t > 0xff) {
                                A[6] ^= (unsigned char)((t >> 8) & 0xff);
                                A[5] ^= (unsigned char)((t >> 16) & 0xff);
                                A[4] ^= (unsigned char)((t >> 24) & 0xff);
-                               }
+                       }
                        memcpy(B + 8, R, 8);
                        AES_decrypt(B, B, key);
                        memcpy(R, B + 8, 8);
-                       }
                }
+       }
        if (!iv)
                iv = default_iv;
-       if (memcmp(A, iv, 8))
-               {
+       if (memcmp(A, iv, 8)) {
                OPENSSL_cleanse(out, inlen);
                return 0;
-               }
-       return inlen;
        }
+       return inlen;
+}
 
 #ifdef AES_WRAP_TEST
 
-int AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
-                        const unsigned char *iv,
-                        const unsigned char *eout,
-                        const unsigned char *key, int keylen)
-       {
+int
+AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
+    const unsigned char *iv, const unsigned char *eout,
+    const unsigned char *key, int keylen)
+{
        unsigned char *otmp = NULL, *ptmp = NULL;
        int r, ret = 0;
        AES_KEY wctx;
@@ -160,7 +153,7 @@ int AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
 
        if (eout && memcmp(eout, otmp, keylen))
                goto err;
-               
+
        if (AES_set_decrypt_key(kek, keybits, &wctx))
                goto err;
        r = AES_unwrap_key(&wctx, iv, ptmp, otmp, r);
@@ -170,74 +163,72 @@ int AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
 
        ret = 1;
 
-       err:
+err:
        if (otmp)
                OPENSSL_free(otmp);
        if (ptmp)
                OPENSSL_free(ptmp);
 
        return ret;
-
-       }
-
+}
 
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-
-static const unsigned char kek[] = {
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-};
-
-static const unsigned char key[] = {
-  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
-};
-
-static const unsigned char e1[] = {
-  0x1f, 0xa6, 0x8b, 0x0a, 0x81, 0x12, 0xb4, 0x47,
-  0xae, 0xf3, 0x4b, 0xd8, 0xfb, 0x5a, 0x7b, 0x82,
-  0x9d, 0x3e, 0x86, 0x23, 0x71, 0xd2, 0xcf, 0xe5
-};
-
-static const unsigned char e2[] = {
-  0x96, 0x77, 0x8b, 0x25, 0xae, 0x6c, 0xa4, 0x35,
-  0xf9, 0x2b, 0x5b, 0x97, 0xc0, 0x50, 0xae, 0xd2,
-  0x46, 0x8a, 0xb8, 0xa1, 0x7a, 0xd8, 0x4e, 0x5d
-};
-
-static const unsigned char e3[] = {
-  0x64, 0xe8, 0xc3, 0xf9, 0xce, 0x0f, 0x5b, 0xa2,
-  0x63, 0xe9, 0x77, 0x79, 0x05, 0x81, 0x8a, 0x2a,
-  0x93, 0xc8, 0x19, 0x1e, 0x7d, 0x6e, 0x8a, 0xe7
-};
-
-static const unsigned char e4[] = {
-  0x03, 0x1d, 0x33, 0x26, 0x4e, 0x15, 0xd3, 0x32,
-  0x68, 0xf2, 0x4e, 0xc2, 0x60, 0x74, 0x3e, 0xdc,
-  0xe1, 0xc6, 0xc7, 0xdd, 0xee, 0x72, 0x5a, 0x93,
-  0x6b, 0xa8, 0x14, 0x91, 0x5c, 0x67, 0x62, 0xd2
-};
-
-static const unsigned char e5[] = {
-  0xa8, 0xf9, 0xbc, 0x16, 0x12, 0xc6, 0x8b, 0x3f,
-  0xf6, 0xe6, 0xf4, 0xfb, 0xe3, 0x0e, 0x71, 0xe4,
-  0x76, 0x9c, 0x8b, 0x80, 0xa3, 0x2c, 0xb8, 0x95,
-  0x8c, 0xd5, 0xd1, 0x7d, 0x6b, 0x25, 0x4d, 0xa1
-};
-
-static const unsigned char e6[] = {
-  0x28, 0xc9, 0xf4, 0x04, 0xc4, 0xb8, 0x10, 0xf4,
-  0xcb, 0xcc, 0xb3, 0x5c, 0xfb, 0x87, 0xf8, 0x26,
-  0x3f, 0x57, 0x86, 0xe2, 0xd8, 0x0e, 0xd3, 0x26,
-  0xcb, 0xc7, 0xf0, 0xe7, 0x1a, 0x99, 0xf4, 0x3b,
-  0xfb, 0x98, 0x8b, 0x9b, 0x7a, 0x02, 0xdd, 0x21
-};
+       static const unsigned char kek[] = {
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+               0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+               0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+               0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
+       };
+
+       static const unsigned char key[] = {
+               0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+               0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+               0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
+       };
+
+       static const unsigned char e1[] = {
+               0x1f, 0xa6, 0x8b, 0x0a, 0x81, 0x12, 0xb4, 0x47,
+               0xae, 0xf3, 0x4b, 0xd8, 0xfb, 0x5a, 0x7b, 0x82,
+               0x9d, 0x3e, 0x86, 0x23, 0x71, 0xd2, 0xcf, 0xe5
+       };
+
+       static const unsigned char e2[] = {
+               0x96, 0x77, 0x8b, 0x25, 0xae, 0x6c, 0xa4, 0x35,
+               0xf9, 0x2b, 0x5b, 0x97, 0xc0, 0x50, 0xae, 0xd2,
+               0x46, 0x8a, 0xb8, 0xa1, 0x7a, 0xd8, 0x4e, 0x5d
+       };
+
+       static const unsigned char e3[] = {
+               0x64, 0xe8, 0xc3, 0xf9, 0xce, 0x0f, 0x5b, 0xa2,
+               0x63, 0xe9, 0x77, 0x79, 0x05, 0x81, 0x8a, 0x2a,
+               0x93, 0xc8, 0x19, 0x1e, 0x7d, 0x6e, 0x8a, 0xe7
+       };
+
+       static const unsigned char e4[] = {
+               0x03, 0x1d, 0x33, 0x26, 0x4e, 0x15, 0xd3, 0x32,
+               0x68, 0xf2, 0x4e, 0xc2, 0x60, 0x74, 0x3e, 0xdc,
+               0xe1, 0xc6, 0xc7, 0xdd, 0xee, 0x72, 0x5a, 0x93,
+               0x6b, 0xa8, 0x14, 0x91, 0x5c, 0x67, 0x62, 0xd2
+       };
+
+       static const unsigned char e5[] = {
+               0xa8, 0xf9, 0xbc, 0x16, 0x12, 0xc6, 0x8b, 0x3f,
+               0xf6, 0xe6, 0xf4, 0xfb, 0xe3, 0x0e, 0x71, 0xe4,
+               0x76, 0x9c, 0x8b, 0x80, 0xa3, 0x2c, 0xb8, 0x95,
+               0x8c, 0xd5, 0xd1, 0x7d, 0x6b, 0x25, 0x4d, 0xa1
+       };
+
+       static const unsigned char e6[] = {
+               0x28, 0xc9, 0xf4, 0x04, 0xc4, 0xb8, 0x10, 0xf4,
+               0xcb, 0xcc, 0xb3, 0x5c, 0xfb, 0x87, 0xf8, 0x26,
+               0x3f, 0x57, 0x86, 0xe2, 0xd8, 0x0e, 0xd3, 0x26,
+               0xcb, 0xc7, 0xf0, 0xe7, 0x1a, 0x99, 0xf4, 0x3b,
+               0xfb, 0x98, 0x8b, 0x9b, 0x7a, 0x02, 0xdd, 0x21
+       };
 
        AES_KEY wctx, xctx;
        int ret;
@@ -254,6 +245,5 @@ static const unsigned char e6[] = {
        ret = AES_wrap_unwrap_test(kek, 256, NULL, e6, key, 32);
        fprintf(stderr, "Key test result %d\n", ret);
 }
-       
-       
+
 #endif
index d323e26..c5d17b3 100644 (file)
 #endif
 
 #if 1
-static void prefetch256(const void *table)
+static void
+prefetch256(const void *table)
 {
-       volatile unsigned long *t=(void *)table,ret;
+       volatile unsigned long *t = (void *)table, ret;
        unsigned long sum;
        int i;
 
        /* 32 is common least cache-line size */
-       for (sum=0,i=0;i<256/sizeof(t[0]);i+=32/sizeof(t[0]))   sum ^= t[i];
+       for (sum = 0, i = 0; i < 256/sizeof(t[0]); i += 32 / sizeof(t[0]))
+               sum ^= t[i];
 
        ret = sum;
 }
@@ -128,350 +130,350 @@ Td4[x] = Si[x].[01];
 #define Td3 (u32)((u64*)((u8*)Td+1))
 
 static const u64 Te[256] = {
-    U64(0xa56363c6a56363c6), U64(0x847c7cf8847c7cf8),
-    U64(0x997777ee997777ee), U64(0x8d7b7bf68d7b7bf6),
-    U64(0x0df2f2ff0df2f2ff), U64(0xbd6b6bd6bd6b6bd6),
-    U64(0xb16f6fdeb16f6fde), U64(0x54c5c59154c5c591),
-    U64(0x5030306050303060), U64(0x0301010203010102),
-    U64(0xa96767cea96767ce), U64(0x7d2b2b567d2b2b56),
-    U64(0x19fefee719fefee7), U64(0x62d7d7b562d7d7b5),
-    U64(0xe6abab4de6abab4d), U64(0x9a7676ec9a7676ec),
-    U64(0x45caca8f45caca8f), U64(0x9d82821f9d82821f),
-    U64(0x40c9c98940c9c989), U64(0x877d7dfa877d7dfa),
-    U64(0x15fafaef15fafaef), U64(0xeb5959b2eb5959b2),
-    U64(0xc947478ec947478e), U64(0x0bf0f0fb0bf0f0fb),
-    U64(0xecadad41ecadad41), U64(0x67d4d4b367d4d4b3),
-    U64(0xfda2a25ffda2a25f), U64(0xeaafaf45eaafaf45),
-    U64(0xbf9c9c23bf9c9c23), U64(0xf7a4a453f7a4a453),
-    U64(0x967272e4967272e4), U64(0x5bc0c09b5bc0c09b),
-    U64(0xc2b7b775c2b7b775), U64(0x1cfdfde11cfdfde1),
-    U64(0xae93933dae93933d), U64(0x6a26264c6a26264c),
-    U64(0x5a36366c5a36366c), U64(0x413f3f7e413f3f7e),
-    U64(0x02f7f7f502f7f7f5), U64(0x4fcccc834fcccc83),
-    U64(0x5c3434685c343468), U64(0xf4a5a551f4a5a551),
-    U64(0x34e5e5d134e5e5d1), U64(0x08f1f1f908f1f1f9),
-    U64(0x937171e2937171e2), U64(0x73d8d8ab73d8d8ab),
-    U64(0x5331316253313162), U64(0x3f15152a3f15152a),
-    U64(0x0c0404080c040408), U64(0x52c7c79552c7c795),
-    U64(0x6523234665232346), U64(0x5ec3c39d5ec3c39d),
-    U64(0x2818183028181830), U64(0xa1969637a1969637),
-    U64(0x0f05050a0f05050a), U64(0xb59a9a2fb59a9a2f),
-    U64(0x0907070e0907070e), U64(0x3612122436121224),
-    U64(0x9b80801b9b80801b), U64(0x3de2e2df3de2e2df),
-    U64(0x26ebebcd26ebebcd), U64(0x6927274e6927274e),
-    U64(0xcdb2b27fcdb2b27f), U64(0x9f7575ea9f7575ea),
-    U64(0x1b0909121b090912), U64(0x9e83831d9e83831d),
-    U64(0x742c2c58742c2c58), U64(0x2e1a1a342e1a1a34),
-    U64(0x2d1b1b362d1b1b36), U64(0xb26e6edcb26e6edc),
-    U64(0xee5a5ab4ee5a5ab4), U64(0xfba0a05bfba0a05b),
-    U64(0xf65252a4f65252a4), U64(0x4d3b3b764d3b3b76),
-    U64(0x61d6d6b761d6d6b7), U64(0xceb3b37dceb3b37d),
-    U64(0x7b2929527b292952), U64(0x3ee3e3dd3ee3e3dd),
-    U64(0x712f2f5e712f2f5e), U64(0x9784841397848413),
-    U64(0xf55353a6f55353a6), U64(0x68d1d1b968d1d1b9),
-    U64(0x0000000000000000), U64(0x2cededc12cededc1),
-    U64(0x6020204060202040), U64(0x1ffcfce31ffcfce3),
-    U64(0xc8b1b179c8b1b179), U64(0xed5b5bb6ed5b5bb6),
-    U64(0xbe6a6ad4be6a6ad4), U64(0x46cbcb8d46cbcb8d),
-    U64(0xd9bebe67d9bebe67), U64(0x4b3939724b393972),
-    U64(0xde4a4a94de4a4a94), U64(0xd44c4c98d44c4c98),
-    U64(0xe85858b0e85858b0), U64(0x4acfcf854acfcf85),
-    U64(0x6bd0d0bb6bd0d0bb), U64(0x2aefefc52aefefc5),
-    U64(0xe5aaaa4fe5aaaa4f), U64(0x16fbfbed16fbfbed),
-    U64(0xc5434386c5434386), U64(0xd74d4d9ad74d4d9a),
-    U64(0x5533336655333366), U64(0x9485851194858511),
-    U64(0xcf45458acf45458a), U64(0x10f9f9e910f9f9e9),
-    U64(0x0602020406020204), U64(0x817f7ffe817f7ffe),
-    U64(0xf05050a0f05050a0), U64(0x443c3c78443c3c78),
-    U64(0xba9f9f25ba9f9f25), U64(0xe3a8a84be3a8a84b),
-    U64(0xf35151a2f35151a2), U64(0xfea3a35dfea3a35d),
-    U64(0xc0404080c0404080), U64(0x8a8f8f058a8f8f05),
-    U64(0xad92923fad92923f), U64(0xbc9d9d21bc9d9d21),
-    U64(0x4838387048383870), U64(0x04f5f5f104f5f5f1),
-    U64(0xdfbcbc63dfbcbc63), U64(0xc1b6b677c1b6b677),
-    U64(0x75dadaaf75dadaaf), U64(0x6321214263212142),
-    U64(0x3010102030101020), U64(0x1affffe51affffe5),
-    U64(0x0ef3f3fd0ef3f3fd), U64(0x6dd2d2bf6dd2d2bf),
-    U64(0x4ccdcd814ccdcd81), U64(0x140c0c18140c0c18),
-    U64(0x3513132635131326), U64(0x2fececc32fececc3),
-    U64(0xe15f5fbee15f5fbe), U64(0xa2979735a2979735),
-    U64(0xcc444488cc444488), U64(0x3917172e3917172e),
-    U64(0x57c4c49357c4c493), U64(0xf2a7a755f2a7a755),
-    U64(0x827e7efc827e7efc), U64(0x473d3d7a473d3d7a),
-    U64(0xac6464c8ac6464c8), U64(0xe75d5dbae75d5dba),
-    U64(0x2b1919322b191932), U64(0x957373e6957373e6),
-    U64(0xa06060c0a06060c0), U64(0x9881811998818119),
-    U64(0xd14f4f9ed14f4f9e), U64(0x7fdcdca37fdcdca3),
-    U64(0x6622224466222244), U64(0x7e2a2a547e2a2a54),
-    U64(0xab90903bab90903b), U64(0x8388880b8388880b),
-    U64(0xca46468cca46468c), U64(0x29eeeec729eeeec7),
-    U64(0xd3b8b86bd3b8b86b), U64(0x3c1414283c141428),
-    U64(0x79dedea779dedea7), U64(0xe25e5ebce25e5ebc),
-    U64(0x1d0b0b161d0b0b16), U64(0x76dbdbad76dbdbad),
-    U64(0x3be0e0db3be0e0db), U64(0x5632326456323264),
-    U64(0x4e3a3a744e3a3a74), U64(0x1e0a0a141e0a0a14),
-    U64(0xdb494992db494992), U64(0x0a06060c0a06060c),
-    U64(0x6c2424486c242448), U64(0xe45c5cb8e45c5cb8),
-    U64(0x5dc2c29f5dc2c29f), U64(0x6ed3d3bd6ed3d3bd),
-    U64(0xefacac43efacac43), U64(0xa66262c4a66262c4),
-    U64(0xa8919139a8919139), U64(0xa4959531a4959531),
-    U64(0x37e4e4d337e4e4d3), U64(0x8b7979f28b7979f2),
-    U64(0x32e7e7d532e7e7d5), U64(0x43c8c88b43c8c88b),
-    U64(0x5937376e5937376e), U64(0xb76d6ddab76d6dda),
-    U64(0x8c8d8d018c8d8d01), U64(0x64d5d5b164d5d5b1),
-    U64(0xd24e4e9cd24e4e9c), U64(0xe0a9a949e0a9a949),
-    U64(0xb46c6cd8b46c6cd8), U64(0xfa5656acfa5656ac),
-    U64(0x07f4f4f307f4f4f3), U64(0x25eaeacf25eaeacf),
-    U64(0xaf6565caaf6565ca), U64(0x8e7a7af48e7a7af4),
-    U64(0xe9aeae47e9aeae47), U64(0x1808081018080810),
-    U64(0xd5baba6fd5baba6f), U64(0x887878f0887878f0),
-    U64(0x6f25254a6f25254a), U64(0x722e2e5c722e2e5c),
-    U64(0x241c1c38241c1c38), U64(0xf1a6a657f1a6a657),
-    U64(0xc7b4b473c7b4b473), U64(0x51c6c69751c6c697),
-    U64(0x23e8e8cb23e8e8cb), U64(0x7cdddda17cdddda1),
-    U64(0x9c7474e89c7474e8), U64(0x211f1f3e211f1f3e),
-    U64(0xdd4b4b96dd4b4b96), U64(0xdcbdbd61dcbdbd61),
-    U64(0x868b8b0d868b8b0d), U64(0x858a8a0f858a8a0f),
-    U64(0x907070e0907070e0), U64(0x423e3e7c423e3e7c),
-    U64(0xc4b5b571c4b5b571), U64(0xaa6666ccaa6666cc),
-    U64(0xd8484890d8484890), U64(0x0503030605030306),
-    U64(0x01f6f6f701f6f6f7), U64(0x120e0e1c120e0e1c),
-    U64(0xa36161c2a36161c2), U64(0x5f35356a5f35356a),
-    U64(0xf95757aef95757ae), U64(0xd0b9b969d0b9b969),
-    U64(0x9186861791868617), U64(0x58c1c19958c1c199),
-    U64(0x271d1d3a271d1d3a), U64(0xb99e9e27b99e9e27),
-    U64(0x38e1e1d938e1e1d9), U64(0x13f8f8eb13f8f8eb),
-    U64(0xb398982bb398982b), U64(0x3311112233111122),
-    U64(0xbb6969d2bb6969d2), U64(0x70d9d9a970d9d9a9),
-    U64(0x898e8e07898e8e07), U64(0xa7949433a7949433),
-    U64(0xb69b9b2db69b9b2d), U64(0x221e1e3c221e1e3c),
-    U64(0x9287871592878715), U64(0x20e9e9c920e9e9c9),
-    U64(0x49cece8749cece87), U64(0xff5555aaff5555aa),
-    U64(0x7828285078282850), U64(0x7adfdfa57adfdfa5),
-    U64(0x8f8c8c038f8c8c03), U64(0xf8a1a159f8a1a159),
-    U64(0x8089890980898909), U64(0x170d0d1a170d0d1a),
-    U64(0xdabfbf65dabfbf65), U64(0x31e6e6d731e6e6d7),
-    U64(0xc6424284c6424284), U64(0xb86868d0b86868d0),
-    U64(0xc3414182c3414182), U64(0xb0999929b0999929),
-    U64(0x772d2d5a772d2d5a), U64(0x110f0f1e110f0f1e),
-    U64(0xcbb0b07bcbb0b07b), U64(0xfc5454a8fc5454a8),
-    U64(0xd6bbbb6dd6bbbb6d), U64(0x3a16162c3a16162c)
+       U64(0xa56363c6a56363c6), U64(0x847c7cf8847c7cf8),
+       U64(0x997777ee997777ee), U64(0x8d7b7bf68d7b7bf6),
+       U64(0x0df2f2ff0df2f2ff), U64(0xbd6b6bd6bd6b6bd6),
+       U64(0xb16f6fdeb16f6fde), U64(0x54c5c59154c5c591),
+       U64(0x5030306050303060), U64(0x0301010203010102),
+       U64(0xa96767cea96767ce), U64(0x7d2b2b567d2b2b56),
+       U64(0x19fefee719fefee7), U64(0x62d7d7b562d7d7b5),
+       U64(0xe6abab4de6abab4d), U64(0x9a7676ec9a7676ec),
+       U64(0x45caca8f45caca8f), U64(0x9d82821f9d82821f),
+       U64(0x40c9c98940c9c989), U64(0x877d7dfa877d7dfa),
+       U64(0x15fafaef15fafaef), U64(0xeb5959b2eb5959b2),
+       U64(0xc947478ec947478e), U64(0x0bf0f0fb0bf0f0fb),
+       U64(0xecadad41ecadad41), U64(0x67d4d4b367d4d4b3),
+       U64(0xfda2a25ffda2a25f), U64(0xeaafaf45eaafaf45),
+       U64(0xbf9c9c23bf9c9c23), U64(0xf7a4a453f7a4a453),
+       U64(0x967272e4967272e4), U64(0x5bc0c09b5bc0c09b),
+       U64(0xc2b7b775c2b7b775), U64(0x1cfdfde11cfdfde1),
+       U64(0xae93933dae93933d), U64(0x6a26264c6a26264c),
+       U64(0x5a36366c5a36366c), U64(0x413f3f7e413f3f7e),
+       U64(0x02f7f7f502f7f7f5), U64(0x4fcccc834fcccc83),
+       U64(0x5c3434685c343468), U64(0xf4a5a551f4a5a551),
+       U64(0x34e5e5d134e5e5d1), U64(0x08f1f1f908f1f1f9),
+       U64(0x937171e2937171e2), U64(0x73d8d8ab73d8d8ab),
+       U64(0x5331316253313162), U64(0x3f15152a3f15152a),
+       U64(0x0c0404080c040408), U64(0x52c7c79552c7c795),
+       U64(0x6523234665232346), U64(0x5ec3c39d5ec3c39d),
+       U64(0x2818183028181830), U64(0xa1969637a1969637),
+       U64(0x0f05050a0f05050a), U64(0xb59a9a2fb59a9a2f),
+       U64(0x0907070e0907070e), U64(0x3612122436121224),
+       U64(0x9b80801b9b80801b), U64(0x3de2e2df3de2e2df),
+       U64(0x26ebebcd26ebebcd), U64(0x6927274e6927274e),
+       U64(0xcdb2b27fcdb2b27f), U64(0x9f7575ea9f7575ea),
+       U64(0x1b0909121b090912), U64(0x9e83831d9e83831d),
+       U64(0x742c2c58742c2c58), U64(0x2e1a1a342e1a1a34),
+       U64(0x2d1b1b362d1b1b36), U64(0xb26e6edcb26e6edc),
+       U64(0xee5a5ab4ee5a5ab4), U64(0xfba0a05bfba0a05b),
+       U64(0xf65252a4f65252a4), U64(0x4d3b3b764d3b3b76),
+       U64(0x61d6d6b761d6d6b7), U64(0xceb3b37dceb3b37d),
+       U64(0x7b2929527b292952), U64(0x3ee3e3dd3ee3e3dd),
+       U64(0x712f2f5e712f2f5e), U64(0x9784841397848413),
+       U64(0xf55353a6f55353a6), U64(0x68d1d1b968d1d1b9),
+       U64(0x0000000000000000), U64(0x2cededc12cededc1),
+       U64(0x6020204060202040), U64(0x1ffcfce31ffcfce3),
+       U64(0xc8b1b179c8b1b179), U64(0xed5b5bb6ed5b5bb6),
+       U64(0xbe6a6ad4be6a6ad4), U64(0x46cbcb8d46cbcb8d),
+       U64(0xd9bebe67d9bebe67), U64(0x4b3939724b393972),
+       U64(0xde4a4a94de4a4a94), U64(0xd44c4c98d44c4c98),
+       U64(0xe85858b0e85858b0), U64(0x4acfcf854acfcf85),
+       U64(0x6bd0d0bb6bd0d0bb), U64(0x2aefefc52aefefc5),
+       U64(0xe5aaaa4fe5aaaa4f), U64(0x16fbfbed16fbfbed),
+       U64(0xc5434386c5434386), U64(0xd74d4d9ad74d4d9a),
+       U64(0x5533336655333366), U64(0x9485851194858511),
+       U64(0xcf45458acf45458a), U64(0x10f9f9e910f9f9e9),
+       U64(0x0602020406020204), U64(0x817f7ffe817f7ffe),
+       U64(0xf05050a0f05050a0), U64(0x443c3c78443c3c78),
+       U64(0xba9f9f25ba9f9f25), U64(0xe3a8a84be3a8a84b),
+       U64(0xf35151a2f35151a2), U64(0xfea3a35dfea3a35d),
+       U64(0xc0404080c0404080), U64(0x8a8f8f058a8f8f05),
+       U64(0xad92923fad92923f), U64(0xbc9d9d21bc9d9d21),
+       U64(0x4838387048383870), U64(0x04f5f5f104f5f5f1),
+       U64(0xdfbcbc63dfbcbc63), U64(0xc1b6b677c1b6b677),
+       U64(0x75dadaaf75dadaaf), U64(0x6321214263212142),
+       U64(0x3010102030101020), U64(0x1affffe51affffe5),
+       U64(0x0ef3f3fd0ef3f3fd), U64(0x6dd2d2bf6dd2d2bf),
+       U64(0x4ccdcd814ccdcd81), U64(0x140c0c18140c0c18),
+       U64(0x3513132635131326), U64(0x2fececc32fececc3),
+       U64(0xe15f5fbee15f5fbe), U64(0xa2979735a2979735),
+       U64(0xcc444488cc444488), U64(0x3917172e3917172e),
+       U64(0x57c4c49357c4c493), U64(0xf2a7a755f2a7a755),
+       U64(0x827e7efc827e7efc), U64(0x473d3d7a473d3d7a),
+       U64(0xac6464c8ac6464c8), U64(0xe75d5dbae75d5dba),
+       U64(0x2b1919322b191932), U64(0x957373e6957373e6),
+       U64(0xa06060c0a06060c0), U64(0x9881811998818119),
+       U64(0xd14f4f9ed14f4f9e), U64(0x7fdcdca37fdcdca3),
+       U64(0x6622224466222244), U64(0x7e2a2a547e2a2a54),
+       U64(0xab90903bab90903b), U64(0x8388880b8388880b),
+       U64(0xca46468cca46468c), U64(0x29eeeec729eeeec7),
+       U64(0xd3b8b86bd3b8b86b), U64(0x3c1414283c141428),
+       U64(0x79dedea779dedea7), U64(0xe25e5ebce25e5ebc),
+       U64(0x1d0b0b161d0b0b16), U64(0x76dbdbad76dbdbad),
+       U64(0x3be0e0db3be0e0db), U64(0x5632326456323264),
+       U64(0x4e3a3a744e3a3a74), U64(0x1e0a0a141e0a0a14),
+       U64(0xdb494992db494992), U64(0x0a06060c0a06060c),
+       U64(0x6c2424486c242448), U64(0xe45c5cb8e45c5cb8),
+       U64(0x5dc2c29f5dc2c29f), U64(0x6ed3d3bd6ed3d3bd),
+       U64(0xefacac43efacac43), U64(0xa66262c4a66262c4),
+       U64(0xa8919139a8919139), U64(0xa4959531a4959531),
+       U64(0x37e4e4d337e4e4d3), U64(0x8b7979f28b7979f2),
+       U64(0x32e7e7d532e7e7d5), U64(0x43c8c88b43c8c88b),
+       U64(0x5937376e5937376e), U64(0xb76d6ddab76d6dda),
+       U64(0x8c8d8d018c8d8d01), U64(0x64d5d5b164d5d5b1),
+       U64(0xd24e4e9cd24e4e9c), U64(0xe0a9a949e0a9a949),
+       U64(0xb46c6cd8b46c6cd8), U64(0xfa5656acfa5656ac),
+       U64(0x07f4f4f307f4f4f3), U64(0x25eaeacf25eaeacf),
+       U64(0xaf6565caaf6565ca), U64(0x8e7a7af48e7a7af4),
+       U64(0xe9aeae47e9aeae47), U64(0x1808081018080810),
+       U64(0xd5baba6fd5baba6f), U64(0x887878f0887878f0),
+       U64(0x6f25254a6f25254a), U64(0x722e2e5c722e2e5c),
+       U64(0x241c1c38241c1c38), U64(0xf1a6a657f1a6a657),
+       U64(0xc7b4b473c7b4b473), U64(0x51c6c69751c6c697),
+       U64(0x23e8e8cb23e8e8cb), U64(0x7cdddda17cdddda1),
+       U64(0x9c7474e89c7474e8), U64(0x211f1f3e211f1f3e),
+       U64(0xdd4b4b96dd4b4b96), U64(0xdcbdbd61dcbdbd61),
+       U64(0x868b8b0d868b8b0d), U64(0x858a8a0f858a8a0f),
+       U64(0x907070e0907070e0), U64(0x423e3e7c423e3e7c),
+       U64(0xc4b5b571c4b5b571), U64(0xaa6666ccaa6666cc),
+       U64(0xd8484890d8484890), U64(0x0503030605030306),
+       U64(0x01f6f6f701f6f6f7), U64(0x120e0e1c120e0e1c),
+       U64(0xa36161c2a36161c2), U64(0x5f35356a5f35356a),
+       U64(0xf95757aef95757ae), U64(0xd0b9b969d0b9b969),
+       U64(0x9186861791868617), U64(0x58c1c19958c1c199),
+       U64(0x271d1d3a271d1d3a), U64(0xb99e9e27b99e9e27),
+       U64(0x38e1e1d938e1e1d9), U64(0x13f8f8eb13f8f8eb),
+       U64(0xb398982bb398982b), U64(0x3311112233111122),
+       U64(0xbb6969d2bb6969d2), U64(0x70d9d9a970d9d9a9),
+       U64(0x898e8e07898e8e07), U64(0xa7949433a7949433),
+       U64(0xb69b9b2db69b9b2d), U64(0x221e1e3c221e1e3c),
+       U64(0x9287871592878715), U64(0x20e9e9c920e9e9c9),
+       U64(0x49cece8749cece87), U64(0xff5555aaff5555aa),
+       U64(0x7828285078282850), U64(0x7adfdfa57adfdfa5),
+       U64(0x8f8c8c038f8c8c03), U64(0xf8a1a159f8a1a159),
+       U64(0x8089890980898909), U64(0x170d0d1a170d0d1a),
+       U64(0xdabfbf65dabfbf65), U64(0x31e6e6d731e6e6d7),
+       U64(0xc6424284c6424284), U64(0xb86868d0b86868d0),
+       U64(0xc3414182c3414182), U64(0xb0999929b0999929),
+       U64(0x772d2d5a772d2d5a), U64(0x110f0f1e110f0f1e),
+       U64(0xcbb0b07bcbb0b07b), U64(0xfc5454a8fc5454a8),
+       U64(0xd6bbbb6dd6bbbb6d), U64(0x3a16162c3a16162c)
 };
 
 static const u8 Te4[256] = {
-    0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
-    0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
-    0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
-    0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
-    0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
-    0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
-    0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
-    0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
-    0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
-    0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
-    0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
-    0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
-    0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
-    0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
-    0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
-    0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
-    0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
-    0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
-    0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
-    0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
-    0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
-    0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
-    0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
-    0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
-    0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
-    0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
-    0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
-    0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
-    0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
-    0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
-    0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
-    0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
+       0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
+       0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
+       0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
+       0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
+       0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
+       0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
+       0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
+       0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
+       0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
+       0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
+       0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
+       0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
+       0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
+       0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
+       0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
+       0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
+       0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
+       0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
+       0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
+       0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
+       0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
+       0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
+       0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
+       0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
+       0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
+       0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
+       0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
+       0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
+       0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
+       0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
+       0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
+       0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
 };
 
 static const u64 Td[256] = {
-    U64(0x50a7f45150a7f451), U64(0x5365417e5365417e),
-    U64(0xc3a4171ac3a4171a), U64(0x965e273a965e273a),
-    U64(0xcb6bab3bcb6bab3b), U64(0xf1459d1ff1459d1f),
-    U64(0xab58faacab58faac), U64(0x9303e34b9303e34b),
-    U64(0x55fa302055fa3020), U64(0xf66d76adf66d76ad),
-    U64(0x9176cc889176cc88), U64(0x254c02f5254c02f5),
-    U64(0xfcd7e54ffcd7e54f), U64(0xd7cb2ac5d7cb2ac5),
-    U64(0x8044352680443526), U64(0x8fa362b58fa362b5),
-    U64(0x495ab1de495ab1de), U64(0x671bba25671bba25),
-    U64(0x980eea45980eea45), U64(0xe1c0fe5de1c0fe5d),
-    U64(0x02752fc302752fc3), U64(0x12f04c8112f04c81),
-    U64(0xa397468da397468d), U64(0xc6f9d36bc6f9d36b),
-    U64(0xe75f8f03e75f8f03), U64(0x959c9215959c9215),
-    U64(0xeb7a6dbfeb7a6dbf), U64(0xda595295da595295),
-    U64(0x2d83bed42d83bed4), U64(0xd3217458d3217458),
-    U64(0x2969e0492969e049), U64(0x44c8c98e44c8c98e),
-    U64(0x6a89c2756a89c275), U64(0x78798ef478798ef4),
-    U64(0x6b3e58996b3e5899), U64(0xdd71b927dd71b927),
-    U64(0xb64fe1beb64fe1be), U64(0x17ad88f017ad88f0),
-    U64(0x66ac20c966ac20c9), U64(0xb43ace7db43ace7d),
-    U64(0x184adf63184adf63), U64(0x82311ae582311ae5),
-    U64(0x6033519760335197), U64(0x457f5362457f5362),
-    U64(0xe07764b1e07764b1), U64(0x84ae6bbb84ae6bbb),
-    U64(0x1ca081fe1ca081fe), U64(0x942b08f9942b08f9),
-    U64(0x5868487058684870), U64(0x19fd458f19fd458f),
-    U64(0x876cde94876cde94), U64(0xb7f87b52b7f87b52),
-    U64(0x23d373ab23d373ab), U64(0xe2024b72e2024b72),
-    U64(0x578f1fe3578f1fe3), U64(0x2aab55662aab5566),
-    U64(0x0728ebb20728ebb2), U64(0x03c2b52f03c2b52f),
-    U64(0x9a7bc5869a7bc586), U64(0xa50837d3a50837d3),
-    U64(0xf2872830f2872830), U64(0xb2a5bf23b2a5bf23),
-    U64(0xba6a0302ba6a0302), U64(0x5c8216ed5c8216ed),
-    U64(0x2b1ccf8a2b1ccf8a), U64(0x92b479a792b479a7),
-    U64(0xf0f207f3f0f207f3), U64(0xa1e2694ea1e2694e),
-    U64(0xcdf4da65cdf4da65), U64(0xd5be0506d5be0506),
-    U64(0x1f6234d11f6234d1), U64(0x8afea6c48afea6c4),
-    U64(0x9d532e349d532e34), U64(0xa055f3a2a055f3a2),
-    U64(0x32e18a0532e18a05), U64(0x75ebf6a475ebf6a4),
-    U64(0x39ec830b39ec830b), U64(0xaaef6040aaef6040),
-    U64(0x069f715e069f715e), U64(0x51106ebd51106ebd),
-    U64(0xf98a213ef98a213e), U64(0x3d06dd963d06dd96),
-    U64(0xae053eddae053edd), U64(0x46bde64d46bde64d),
-    U64(0xb58d5491b58d5491), U64(0x055dc471055dc471),
-    U64(0x6fd406046fd40604), U64(0xff155060ff155060),
-    U64(0x24fb981924fb9819), U64(0x97e9bdd697e9bdd6),
-    U64(0xcc434089cc434089), U64(0x779ed967779ed967),
-    U64(0xbd42e8b0bd42e8b0), U64(0x888b8907888b8907),
-    U64(0x385b19e7385b19e7), U64(0xdbeec879dbeec879),
-    U64(0x470a7ca1470a7ca1), U64(0xe90f427ce90f427c),
-    U64(0xc91e84f8c91e84f8), U64(0x0000000000000000),
-    U64(0x8386800983868009), U64(0x48ed2b3248ed2b32),
-    U64(0xac70111eac70111e), U64(0x4e725a6c4e725a6c),
-    U64(0xfbff0efdfbff0efd), U64(0x5638850f5638850f),
-    U64(0x1ed5ae3d1ed5ae3d), U64(0x27392d3627392d36),
-    U64(0x64d90f0a64d90f0a), U64(0x21a65c6821a65c68),
-    U64(0xd1545b9bd1545b9b), U64(0x3a2e36243a2e3624),
-    U64(0xb1670a0cb1670a0c), U64(0x0fe757930fe75793),
-    U64(0xd296eeb4d296eeb4), U64(0x9e919b1b9e919b1b),
-    U64(0x4fc5c0804fc5c080), U64(0xa220dc61a220dc61),
-    U64(0x694b775a694b775a), U64(0x161a121c161a121c),
-    U64(0x0aba93e20aba93e2), U64(0xe52aa0c0e52aa0c0),
-    U64(0x43e0223c43e0223c), U64(0x1d171b121d171b12),
-    U64(0x0b0d090e0b0d090e), U64(0xadc78bf2adc78bf2),
-    U64(0xb9a8b62db9a8b62d), U64(0xc8a91e14c8a91e14),
-    U64(0x8519f1578519f157), U64(0x4c0775af4c0775af),
-    U64(0xbbdd99eebbdd99ee), U64(0xfd607fa3fd607fa3),
-    U64(0x9f2601f79f2601f7), U64(0xbcf5725cbcf5725c),
-    U64(0xc53b6644c53b6644), U64(0x347efb5b347efb5b),
-    U64(0x7629438b7629438b), U64(0xdcc623cbdcc623cb),
-    U64(0x68fcedb668fcedb6), U64(0x63f1e4b863f1e4b8),
-    U64(0xcadc31d7cadc31d7), U64(0x1085634210856342),
-    U64(0x4022971340229713), U64(0x2011c6842011c684),
-    U64(0x7d244a857d244a85), U64(0xf83dbbd2f83dbbd2),
-    U64(0x1132f9ae1132f9ae), U64(0x6da129c76da129c7),
-    U64(0x4b2f9e1d4b2f9e1d), U64(0xf330b2dcf330b2dc),
-    U64(0xec52860dec52860d), U64(0xd0e3c177d0e3c177),
-    U64(0x6c16b32b6c16b32b), U64(0x99b970a999b970a9),
-    U64(0xfa489411fa489411), U64(0x2264e9472264e947),
-    U64(0xc48cfca8c48cfca8), U64(0x1a3ff0a01a3ff0a0),
-    U64(0xd82c7d56d82c7d56), U64(0xef903322ef903322),
-    U64(0xc74e4987c74e4987), U64(0xc1d138d9c1d138d9),
-    U64(0xfea2ca8cfea2ca8c), U64(0x360bd498360bd498),
-    U64(0xcf81f5a6cf81f5a6), U64(0x28de7aa528de7aa5),
-    U64(0x268eb7da268eb7da), U64(0xa4bfad3fa4bfad3f),
-    U64(0xe49d3a2ce49d3a2c), U64(0x0d9278500d927850),
-    U64(0x9bcc5f6a9bcc5f6a), U64(0x62467e5462467e54),
-    U64(0xc2138df6c2138df6), U64(0xe8b8d890e8b8d890),
-    U64(0x5ef7392e5ef7392e), U64(0xf5afc382f5afc382),
-    U64(0xbe805d9fbe805d9f), U64(0x7c93d0697c93d069),
-    U64(0xa92dd56fa92dd56f), U64(0xb31225cfb31225cf),
-    U64(0x3b99acc83b99acc8), U64(0xa77d1810a77d1810),
-    U64(0x6e639ce86e639ce8), U64(0x7bbb3bdb7bbb3bdb),
-    U64(0x097826cd097826cd), U64(0xf418596ef418596e),
-    U64(0x01b79aec01b79aec), U64(0xa89a4f83a89a4f83),
-    U64(0x656e95e6656e95e6), U64(0x7ee6ffaa7ee6ffaa),
-    U64(0x08cfbc2108cfbc21), U64(0xe6e815efe6e815ef),
-    U64(0xd99be7bad99be7ba), U64(0xce366f4ace366f4a),
-    U64(0xd4099fead4099fea), U64(0xd67cb029d67cb029),
-    U64(0xafb2a431afb2a431), U64(0x31233f2a31233f2a),
-    U64(0x3094a5c63094a5c6), U64(0xc066a235c066a235),
-    U64(0x37bc4e7437bc4e74), U64(0xa6ca82fca6ca82fc),
-    U64(0xb0d090e0b0d090e0), U64(0x15d8a73315d8a733),
-    U64(0x4a9804f14a9804f1), U64(0xf7daec41f7daec41),
-    U64(0x0e50cd7f0e50cd7f), U64(0x2ff691172ff69117),
-    U64(0x8dd64d768dd64d76), U64(0x4db0ef434db0ef43),
-    U64(0x544daacc544daacc), U64(0xdf0496e4df0496e4),
-    U64(0xe3b5d19ee3b5d19e), U64(0x1b886a4c1b886a4c),
-    U64(0xb81f2cc1b81f2cc1), U64(0x7f5165467f516546),
-    U64(0x04ea5e9d04ea5e9d), U64(0x5d358c015d358c01),
-    U64(0x737487fa737487fa), U64(0x2e410bfb2e410bfb),
-    U64(0x5a1d67b35a1d67b3), U64(0x52d2db9252d2db92),
-    U64(0x335610e9335610e9), U64(0x1347d66d1347d66d),
-    U64(0x8c61d79a8c61d79a), U64(0x7a0ca1377a0ca137),
-    U64(0x8e14f8598e14f859), U64(0x893c13eb893c13eb),
-    U64(0xee27a9ceee27a9ce), U64(0x35c961b735c961b7),
-    U64(0xede51ce1ede51ce1), U64(0x3cb1477a3cb1477a),
-    U64(0x59dfd29c59dfd29c), U64(0x3f73f2553f73f255),
-    U64(0x79ce141879ce1418), U64(0xbf37c773bf37c773),
-    U64(0xeacdf753eacdf753), U64(0x5baafd5f5baafd5f),
-    U64(0x146f3ddf146f3ddf), U64(0x86db447886db4478),
-    U64(0x81f3afca81f3afca), U64(0x3ec468b93ec468b9),
-    U64(0x2c3424382c342438), U64(0x5f40a3c25f40a3c2),
-    U64(0x72c31d1672c31d16), U64(0x0c25e2bc0c25e2bc),
-    U64(0x8b493c288b493c28), U64(0x41950dff41950dff),
-    U64(0x7101a8397101a839), U64(0xdeb30c08deb30c08),
-    U64(0x9ce4b4d89ce4b4d8), U64(0x90c1566490c15664),
-    U64(0x6184cb7b6184cb7b), U64(0x70b632d570b632d5),
-    U64(0x745c6c48745c6c48), U64(0x4257b8d04257b8d0)
+       U64(0x50a7f45150a7f451), U64(0x5365417e5365417e),
+       U64(0xc3a4171ac3a4171a), U64(0x965e273a965e273a),
+       U64(0xcb6bab3bcb6bab3b), U64(0xf1459d1ff1459d1f),
+       U64(0xab58faacab58faac), U64(0x9303e34b9303e34b),
+       U64(0x55fa302055fa3020), U64(0xf66d76adf66d76ad),
+       U64(0x9176cc889176cc88), U64(0x254c02f5254c02f5),
+       U64(0xfcd7e54ffcd7e54f), U64(0xd7cb2ac5d7cb2ac5),
+       U64(0x8044352680443526), U64(0x8fa362b58fa362b5),
+       U64(0x495ab1de495ab1de), U64(0x671bba25671bba25),
+       U64(0x980eea45980eea45), U64(0xe1c0fe5de1c0fe5d),
+       U64(0x02752fc302752fc3), U64(0x12f04c8112f04c81),
+       U64(0xa397468da397468d), U64(0xc6f9d36bc6f9d36b),
+       U64(0xe75f8f03e75f8f03), U64(0x959c9215959c9215),
+       U64(0xeb7a6dbfeb7a6dbf), U64(0xda595295da595295),
+       U64(0x2d83bed42d83bed4), U64(0xd3217458d3217458),
+       U64(0x2969e0492969e049), U64(0x44c8c98e44c8c98e),
+       U64(0x6a89c2756a89c275), U64(0x78798ef478798ef4),
+       U64(0x6b3e58996b3e5899), U64(0xdd71b927dd71b927),
+       U64(0xb64fe1beb64fe1be), U64(0x17ad88f017ad88f0),
+       U64(0x66ac20c966ac20c9), U64(0xb43ace7db43ace7d),
+       U64(0x184adf63184adf63), U64(0x82311ae582311ae5),
+       U64(0x6033519760335197), U64(0x457f5362457f5362),
+       U64(0xe07764b1e07764b1), U64(0x84ae6bbb84ae6bbb),
+       U64(0x1ca081fe1ca081fe), U64(0x942b08f9942b08f9),
+       U64(0x5868487058684870), U64(0x19fd458f19fd458f),
+       U64(0x876cde94876cde94), U64(0xb7f87b52b7f87b52),
+       U64(0x23d373ab23d373ab), U64(0xe2024b72e2024b72),
+       U64(0x578f1fe3578f1fe3), U64(0x2aab55662aab5566),
+       U64(0x0728ebb20728ebb2), U64(0x03c2b52f03c2b52f),
+       U64(0x9a7bc5869a7bc586), U64(0xa50837d3a50837d3),
+       U64(0xf2872830f2872830), U64(0xb2a5bf23b2a5bf23),
+       U64(0xba6a0302ba6a0302), U64(0x5c8216ed5c8216ed),
+       U64(0x2b1ccf8a2b1ccf8a), U64(0x92b479a792b479a7),
+       U64(0xf0f207f3f0f207f3), U64(0xa1e2694ea1e2694e),
+       U64(0xcdf4da65cdf4da65), U64(0xd5be0506d5be0506),
+       U64(0x1f6234d11f6234d1), U64(0x8afea6c48afea6c4),
+       U64(0x9d532e349d532e34), U64(0xa055f3a2a055f3a2),
+       U64(0x32e18a0532e18a05), U64(0x75ebf6a475ebf6a4),
+       U64(0x39ec830b39ec830b), U64(0xaaef6040aaef6040),
+       U64(0x069f715e069f715e), U64(0x51106ebd51106ebd),
+       U64(0xf98a213ef98a213e), U64(0x3d06dd963d06dd96),
+       U64(0xae053eddae053edd), U64(0x46bde64d46bde64d),
+       U64(0xb58d5491b58d5491), U64(0x055dc471055dc471),
+       U64(0x6fd406046fd40604), U64(0xff155060ff155060),
+       U64(0x24fb981924fb9819), U64(0x97e9bdd697e9bdd6),
+       U64(0xcc434089cc434089), U64(0x779ed967779ed967),
+       U64(0xbd42e8b0bd42e8b0), U64(0x888b8907888b8907),
+       U64(0x385b19e7385b19e7), U64(0xdbeec879dbeec879),
+       U64(0x470a7ca1470a7ca1), U64(0xe90f427ce90f427c),
+       U64(0xc91e84f8c91e84f8), U64(0x0000000000000000),
+       U64(0x8386800983868009), U64(0x48ed2b3248ed2b32),
+       U64(0xac70111eac70111e), U64(0x4e725a6c4e725a6c),
+       U64(0xfbff0efdfbff0efd), U64(0x5638850f5638850f),
+       U64(0x1ed5ae3d1ed5ae3d), U64(0x27392d3627392d36),
+       U64(0x64d90f0a64d90f0a), U64(0x21a65c6821a65c68),
+       U64(0xd1545b9bd1545b9b), U64(0x3a2e36243a2e3624),
+       U64(0xb1670a0cb1670a0c), U64(0x0fe757930fe75793),
+       U64(0xd296eeb4d296eeb4), U64(0x9e919b1b9e919b1b),
+       U64(0x4fc5c0804fc5c080), U64(0xa220dc61a220dc61),
+       U64(0x694b775a694b775a), U64(0x161a121c161a121c),
+       U64(0x0aba93e20aba93e2), U64(0xe52aa0c0e52aa0c0),
+       U64(0x43e0223c43e0223c), U64(0x1d171b121d171b12),
+       U64(0x0b0d090e0b0d090e), U64(0xadc78bf2adc78bf2),
+       U64(0xb9a8b62db9a8b62d), U64(0xc8a91e14c8a91e14),
+       U64(0x8519f1578519f157), U64(0x4c0775af4c0775af),
+       U64(0xbbdd99eebbdd99ee), U64(0xfd607fa3fd607fa3),
+       U64(0x9f2601f79f2601f7), U64(0xbcf5725cbcf5725c),
+       U64(0xc53b6644c53b6644), U64(0x347efb5b347efb5b),
+       U64(0x7629438b7629438b), U64(0xdcc623cbdcc623cb),
+       U64(0x68fcedb668fcedb6), U64(0x63f1e4b863f1e4b8),
+       U64(0xcadc31d7cadc31d7), U64(0x1085634210856342),
+       U64(0x4022971340229713), U64(0x2011c6842011c684),
+       U64(0x7d244a857d244a85), U64(0xf83dbbd2f83dbbd2),
+       U64(0x1132f9ae1132f9ae), U64(0x6da129c76da129c7),
+       U64(0x4b2f9e1d4b2f9e1d), U64(0xf330b2dcf330b2dc),
+       U64(0xec52860dec52860d), U64(0xd0e3c177d0e3c177),
+       U64(0x6c16b32b6c16b32b), U64(0x99b970a999b970a9),
+       U64(0xfa489411fa489411), U64(0x2264e9472264e947),
+       U64(0xc48cfca8c48cfca8), U64(0x1a3ff0a01a3ff0a0),
+       U64(0xd82c7d56d82c7d56), U64(0xef903322ef903322),
+       U64(0xc74e4987c74e4987), U64(0xc1d138d9c1d138d9),
+       U64(0xfea2ca8cfea2ca8c), U64(0x360bd498360bd498),
+       U64(0xcf81f5a6cf81f5a6), U64(0x28de7aa528de7aa5),
+       U64(0x268eb7da268eb7da), U64(0xa4bfad3fa4bfad3f),
+       U64(0xe49d3a2ce49d3a2c), U64(0x0d9278500d927850),
+       U64(0x9bcc5f6a9bcc5f6a), U64(0x62467e5462467e54),
+       U64(0xc2138df6c2138df6), U64(0xe8b8d890e8b8d890),
+       U64(0x5ef7392e5ef7392e), U64(0xf5afc382f5afc382),
+       U64(0xbe805d9fbe805d9f), U64(0x7c93d0697c93d069),
+       U64(0xa92dd56fa92dd56f), U64(0xb31225cfb31225cf),
+       U64(0x3b99acc83b99acc8), U64(0xa77d1810a77d1810),
+       U64(0x6e639ce86e639ce8), U64(0x7bbb3bdb7bbb3bdb),
+       U64(0x097826cd097826cd), U64(0xf418596ef418596e),
+       U64(0x01b79aec01b79aec), U64(0xa89a4f83a89a4f83),
+       U64(0x656e95e6656e95e6), U64(0x7ee6ffaa7ee6ffaa),
+       U64(0x08cfbc2108cfbc21), U64(0xe6e815efe6e815ef),
+       U64(0xd99be7bad99be7ba), U64(0xce366f4ace366f4a),
+       U64(0xd4099fead4099fea), U64(0xd67cb029d67cb029),
+       U64(0xafb2a431afb2a431), U64(0x31233f2a31233f2a),
+       U64(0x3094a5c63094a5c6), U64(0xc066a235c066a235),
+       U64(0x37bc4e7437bc4e74), U64(0xa6ca82fca6ca82fc),
+       U64(0xb0d090e0b0d090e0), U64(0x15d8a73315d8a733),
+       U64(0x4a9804f14a9804f1), U64(0xf7daec41f7daec41),
+       U64(0x0e50cd7f0e50cd7f), U64(0x2ff691172ff69117),
+       U64(0x8dd64d768dd64d76), U64(0x4db0ef434db0ef43),
+       U64(0x544daacc544daacc), U64(0xdf0496e4df0496e4),
+       U64(0xe3b5d19ee3b5d19e), U64(0x1b886a4c1b886a4c),
+       U64(0xb81f2cc1b81f2cc1), U64(0x7f5165467f516546),
+       U64(0x04ea5e9d04ea5e9d), U64(0x5d358c015d358c01),
+       U64(0x737487fa737487fa), U64(0x2e410bfb2e410bfb),
+       U64(0x5a1d67b35a1d67b3), U64(0x52d2db9252d2db92),
+       U64(0x335610e9335610e9), U64(0x1347d66d1347d66d),
+       U64(0x8c61d79a8c61d79a), U64(0x7a0ca1377a0ca137),
+       U64(0x8e14f8598e14f859), U64(0x893c13eb893c13eb),
+       U64(0xee27a9ceee27a9ce), U64(0x35c961b735c961b7),
+       U64(0xede51ce1ede51ce1), U64(0x3cb1477a3cb1477a),
+       U64(0x59dfd29c59dfd29c), U64(0x3f73f2553f73f255),
+       U64(0x79ce141879ce1418), U64(0xbf37c773bf37c773),
+       U64(0xeacdf753eacdf753), U64(0x5baafd5f5baafd5f),
+       U64(0x146f3ddf146f3ddf), U64(0x86db447886db4478),
+       U64(0x81f3afca81f3afca), U64(0x3ec468b93ec468b9),
+       U64(0x2c3424382c342438), U64(0x5f40a3c25f40a3c2),
+       U64(0x72c31d1672c31d16), U64(0x0c25e2bc0c25e2bc),
+       U64(0x8b493c288b493c28), U64(0x41950dff41950dff),
+       U64(0x7101a8397101a839), U64(0xdeb30c08deb30c08),
+       U64(0x9ce4b4d89ce4b4d8), U64(0x90c1566490c15664),
+       U64(0x6184cb7b6184cb7b), U64(0x70b632d570b632d5),
+       U64(0x745c6c48745c6c48), U64(0x4257b8d04257b8d0)
 };
 static const u8 Td4[256] = {
-    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
-    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
-    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
-    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
-    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
-    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
-    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
-    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
-    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
-    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
-    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
-    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
-    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
-    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
-    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
-    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
-    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
-    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
-    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
-    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
-    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
-    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
-    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
-    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
-    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
-    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
-    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
-    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
-    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
-    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
-    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
-    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU
+       0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
+       0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
+       0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
+       0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
+       0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
+       0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
+       0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
+       0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
+       0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
+       0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
+       0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
+       0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
+       0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
+       0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
+       0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
+       0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
+       0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
+       0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
+       0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
+       0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
+       0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
+       0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
+       0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
+       0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
+       0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
+       0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
+       0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
+       0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
+       0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
+       0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
+       0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
+       0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU
 };
 
 static const u32 rcon[] = {
-    0x00000001U, 0x00000002U, 0x00000004U, 0x00000008U,
-    0x00000010U, 0x00000020U, 0x00000040U, 0x00000080U,
-    0x0000001bU, 0x00000036U, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+       0x00000001U, 0x00000002U, 0x00000004U, 0x00000008U,
+       0x00000010U, 0x00000020U, 0x00000040U, 0x00000080U,
+       0x0000001bU, 0x00000036U,
+       /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
 };
 
 /**
  * Expand the cipher key into the encryption key schedule.
  */
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key) {
-
+int
+AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) {
        u32 *rk;
-       int i = 0;
+       int i = 0;
        u32 temp;
 
        if (!userKey || !key)
@@ -481,26 +483,26 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 
        rk = key->rd_key;
 
-       if (bits==128)
+       if (bits == 128)
                key->rounds = 10;
-       else if (bits==192)
+       else if (bits == 192)
                key->rounds = 12;
        else
                key->rounds = 14;
 
-       rk[0] = GETU32(userKey     );
+       rk[0] = GETU32(userKey);
        rk[1] = GETU32(userKey +  4);
        rk[2] = GETU32(userKey +  8);
        rk[3] = GETU32(userKey + 12);
        if (bits == 128) {
                while (1) {
-                       temp  = rk[3];
+                       temp = rk[3];
                        rk[4] = rk[0] ^
-                               (Te4[(temp >>  8) & 0xff]      ) ^
-                               (Te4[(temp >> 16) & 0xff] <<  8) ^
-                               (Te4[(temp >> 24)       ] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 24) ^
-                               rcon[i];
+                           (Te4[(temp >> 8) & 0xff]) ^
+                           (Te4[(temp >> 16) & 0xff] <<  8) ^
+                           (Te4[(temp >> 24)] << 16) ^
+                           (Te4[(temp) & 0xff] << 24) ^
+                           rcon[i];
                        rk[5] = rk[1] ^ rk[4];
                        rk[6] = rk[2] ^ rk[5];
                        rk[7] = rk[3] ^ rk[6];
@@ -514,21 +516,21 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[5] = GETU32(userKey + 20);
        if (bits == 192) {
                while (1) {
-                       temp = rk[ 5];
-                       rk[ 6] = rk[ 0] ^
-                               (Te4[(temp >>  8) & 0xff]      ) ^
-                               (Te4[(temp >> 16) & 0xff] <<  8) ^
-                               (Te4[(temp >> 24)       ] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 24) ^
-                               rcon[i];
-                       rk[ 7] = rk[ 1] ^ rk[ 6];
-                       rk[ 8] = rk[ 2] ^ rk[ 7];
-                       rk[ 9] = rk[ 3] ^ rk[ 8];
+                       temp = rk[5];
+                       rk[6] = rk[ 0] ^
+                           (Te4[(temp >> 8) & 0xff]) ^
+                           (Te4[(temp >> 16) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)] << 16) ^
+                           (Te4[(temp) & 0xff] << 24) ^
+                       rcon[i];
+                       rk[7] = rk[1] ^ rk[6];
+                       rk[8] = rk[2] ^ rk[7];
+                       rk[9] = rk[3] ^ rk[8];
                        if (++i == 8) {
                                return 0;
                        }
-                       rk[10] = rk[ 4] ^ rk[ 9];
-                       rk[11] = rk[ 5] ^ rk[10];
+                       rk[10] = rk[4] ^ rk[9];
+                       rk[11] = rk[5] ^ rk[10];
                        rk += 6;
                }
        }
@@ -536,31 +538,31 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[7] = GETU32(userKey + 28);
        if (bits == 256) {
                while (1) {
-                       temp = rk[ 7];
-                       rk[ 8] = rk[ 0] ^
-                               (Te4[(temp >>  8) & 0xff]      ) ^
-                               (Te4[(temp >> 16) & 0xff] <<  8) ^
-                               (Te4[(temp >> 24)       ] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 24) ^
-                               rcon[i];
-                       rk[ 9] = rk[ 1] ^ rk[ 8];
-                       rk[10] = rk[ 2] ^ rk[ 9];
-                       rk[11] = rk[ 3] ^ rk[10];
+                       temp = rk[7];
+                       rk[8] = rk[0] ^
+                           (Te4[(temp >> 8) & 0xff]) ^
+                           (Te4[(temp >> 16) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)] << 16) ^
+                           (Te4[(temp) & 0xff] << 24) ^
+                           rcon[i];
+                       rk[9] = rk[1] ^ rk[8];
+                       rk[10] = rk[2] ^ rk[9];
+                       rk[11] = rk[3] ^ rk[10];
                        if (++i == 7) {
                                return 0;
                        }
                        temp = rk[11];
-                       rk[12] = rk[ 4] ^
-                               (Te4[(temp      ) & 0xff]      ) ^
-                               (Te4[(temp >>  8) & 0xff] <<  8) ^
-                               (Te4[(temp >> 16) & 0xff] << 16) ^
-                               (Te4[(temp >> 24)       ] << 24);
-                       rk[13] = rk[ 5] ^ rk[12];
-                       rk[14] = rk[ 6] ^ rk[13];
-                       rk[15] = rk[ 7] ^ rk[14];
+                       rk[12] = rk[4] ^
+                           (Te4[(temp) & 0xff]) ^
+                           (Te4[(temp >> 8) & 0xff] << 8) ^
+                           (Te4[(temp >> 16) & 0xff] << 16) ^
+                           (Te4[(temp >> 24)] << 24);
+                       rk[13] = rk[5] ^ rk[12];
+                       rk[14] = rk[6] ^ rk[13];
+                       rk[15] = rk[7] ^ rk[14];
 
                        rk += 8;
-               }
+               }
        }
        return 0;
 }
@@ -568,10 +570,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 /**
  * Expand the cipher key into the decryption key schedule.
  */
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key) {
-
-        u32 *rk;
+int
+AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key)
+{
+       u32 *rk;
        int i, j, status;
        u32 temp;
 
@@ -584,10 +586,18 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
 
        /* invert the order of the round keys: */
        for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-               temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-               temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-               temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-               temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+               temp = rk[i];
+               rk[i] = rk[j];
+               rk[j] = temp;
+               temp = rk[i + 1];
+               rk[i + 1] = rk[j + 1];
+               rk[j + 1] = temp;
+               temp = rk[i + 2];
+               rk[i + 2] = rk[j + 2];
+               rk[j + 2] = temp;
+               temp = rk[i + 3];
+               rk[i + 3] = rk[j + 3];
+               rk[j + 3] = temp;
        }
        /* apply the inverse MixColumn transform to all round keys but the first and the last: */
        for (i = 1; i < (key->rounds); i++) {
@@ -599,47 +609,47 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
                        tp1 = rk[j];
                        m = tp1 & 0x80808080;
                        tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp2 & 0x80808080;
                        tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp4 & 0x80808080;
                        tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        tp9 = tp8 ^ tp1;
                        tpb = tp9 ^ tp2;
                        tpd = tp9 ^ tp4;
                        tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-                       rk[j] = tpe ^ ROTATE(tpd,16) ^
-                               ROTATE(tp9,8) ^ ROTATE(tpb,24);
+                       rk[j] = tpe ^ ROTATE(tpd, 16) ^
+                       ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-                       rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-                               (tp9 >> 24) ^ (tp9 << 8) ^
-                               (tpb >> 8) ^ (tpb << 24);
+                       rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
+                           (tp9 >> 24) ^ (tp9 << 8) ^
+                           (tpb >> 8) ^ (tpb << 24);
 #endif
                }
 #else
                rk[0] =
-                       Td0[Te2[(rk[0]      ) & 0xff] & 0xff] ^
-                       Td1[Te2[(rk[0] >>  8) & 0xff] & 0xff] ^
-                       Td2[Te2[(rk[0] >> 16) & 0xff] & 0xff] ^
-                       Td3[Te2[(rk[0] >> 24)       ] & 0xff];
+                   Td0[Te2[(rk[0]) & 0xff] & 0xff] ^
+                   Td1[Te2[(rk[0] >> 8) & 0xff] & 0xff] ^
+                   Td2[Te2[(rk[0] >> 16) & 0xff] & 0xff] ^
+                   Td3[Te2[(rk[0] >> 24)] & 0xff];
                rk[1] =
-                       Td0[Te2[(rk[1]      ) & 0xff] & 0xff] ^
-                       Td1[Te2[(rk[1] >>  8) & 0xff] & 0xff] ^
-                       Td2[Te2[(rk[1] >> 16) & 0xff] & 0xff] ^
-                       Td3[Te2[(rk[1] >> 24)       ] & 0xff];
+                   Td0[Te2[(rk[1]) & 0xff] & 0xff] ^
+                   Td1[Te2[(rk[1] >> 8) & 0xff] & 0xff] ^
+                   Td2[Te2[(rk[1] >> 16) & 0xff] & 0xff] ^
+                   Td3[Te2[(rk[1] >> 24)] & 0xff];
                rk[2] =
-                       Td0[Te2[(rk[2]      ) & 0xff] & 0xff] ^
-                       Td1[Te2[(rk[2] >>  8) & 0xff] & 0xff] ^
-                       Td2[Te2[(rk[2] >> 16) & 0xff] & 0xff] ^
-                       Td3[Te2[(rk[2] >> 24)       ] & 0xff];
+                   Td0[Te2[(rk[2]) & 0xff] & 0xff] ^
+                   Td1[Te2[(rk[2] >> 8) & 0xff] & 0xff] ^
+                   Td2[Te2[(rk[2] >> 16) & 0xff] & 0xff] ^
+                   Td3[Te2[(rk[2] >> 24)] & 0xff];
                rk[3] =
-                       Td0[Te2[(rk[3]      ) & 0xff] & 0xff] ^
-                       Td1[Te2[(rk[3] >>  8) & 0xff] & 0xff] ^
-                       Td2[Te2[(rk[3] >> 16) & 0xff] & 0xff] ^
-                       Td3[Te2[(rk[3] >> 24)       ] & 0xff];
+                   Td0[Te2[(rk[3]) & 0xff] & 0xff] ^
+                   Td1[Te2[(rk[3] >> 8) & 0xff] & 0xff] ^
+                   Td2[Te2[(rk[3] >> 16) & 0xff] & 0xff] ^
+                   Td3[Te2[(rk[3] >> 24)] & 0xff];
 #endif
        }
        return 0;
@@ -649,9 +659,9 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
  * Encrypt a single block
  * in and out can overlap
  */
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-                const AES_KEY *key) {
-
+void
+AES_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
+{
        const u32 *rk;
        u32 s0, s1, s2, s3, t[4];
        int r;
@@ -663,197 +673,205 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
         * map byte array block to cipher state
         * and add initial round key:
         */
-       s0 = GETU32(in     ) ^ rk[0];
-       s1 = GETU32(in +  4) ^ rk[1];
-       s2 = GETU32(in +  8) ^ rk[2];
+       s0 = GETU32(in) ^ rk[0];
+       s1 = GETU32(in + 4) ^ rk[1];
+       s2 = GETU32(in + 8) ^ rk[2];
        s3 = GETU32(in + 12) ^ rk[3];
 
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
        prefetch256(Te4);
 
-       t[0] =  Te4[(s0      ) & 0xff]       ^
-               Te4[(s1 >>  8) & 0xff] <<  8 ^
-               Te4[(s2 >> 16) & 0xff] << 16 ^
-               Te4[(s3 >> 24)       ] << 24;
-       t[1] =  Te4[(s1      ) & 0xff]       ^
-               Te4[(s2 >>  8) & 0xff] <<  8 ^
-               Te4[(s3 >> 16) & 0xff] << 16 ^
-               Te4[(s0 >> 24)       ] << 24;
-       t[2] =  Te4[(s2      ) & 0xff]       ^
-               Te4[(s3 >>  8) & 0xff] <<  8 ^
-               Te4[(s0 >> 16) & 0xff] << 16 ^
-               Te4[(s1 >> 24)       ] << 24;
-       t[3] =  Te4[(s3      ) & 0xff]       ^
-               Te4[(s0 >>  8) & 0xff] <<  8 ^
-               Te4[(s1 >> 16) & 0xff] << 16 ^
-               Te4[(s2 >> 24)       ] << 24;
+       t[0] = Te4[(s0) & 0xff] ^
+           Te4[(s1 >> 8) & 0xff] << 8 ^
+           Te4[(s2 >> 16) & 0xff] << 16 ^
+           Te4[(s3 >> 24)] << 24;
+       t[1] = Te4[(s1) & 0xff] ^
+           Te4[(s2 >> 8) & 0xff] << 8 ^
+           Te4[(s3 >> 16) & 0xff] << 16 ^
+           Te4[(s0 >> 24)] << 24;
+       t[2] = Te4[(s2) & 0xff] ^
+           Te4[(s3 >> 8) & 0xff] << 8 ^
+           Te4[(s0 >> 16) & 0xff] << 16 ^
+           Te4[(s1 >> 24)] << 24;
+       t[3] = Te4[(s3) & 0xff] ^
+           Te4[(s0 >> 8) & 0xff] << 8 ^
+           Te4[(s1 >> 16) & 0xff] << 16 ^
+           Te4[(s2 >> 24)] << 24;
 
        /* now do the linear transform using words */
-       {       int i;
+       {
+               int i;
                u32 r0, r1, r2;
 
                for (i = 0; i < 4; i++) {
                        r0 = t[i];
                        r1 = r0 & 0x80808080;
                        r2 = ((r0 & 0x7f7f7f7f) << 1) ^
-                               ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
+                           ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
 #if defined(ROTATE)
-                       t[i] = r2 ^ ROTATE(r2,24) ^ ROTATE(r0,24) ^
-                               ROTATE(r0,16) ^ ROTATE(r0,8);
+                       t[i] = r2 ^ ROTATE(r2, 24) ^ ROTATE(r0, 24) ^
+                           ROTATE(r0, 16) ^ ROTATE(r0, 8);
 #else
                        t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^
-                               (r0 << 16) ^ (r0 >> 16) ^
-                               (r0 << 8) ^ (r0 >> 24);
+                           (r0 << 16) ^ (r0 >> 16) ^ (r0 << 8) ^ (r0 >> 24);
 #endif
-                       t[i] ^= rk[4+i];
+                       t[i] ^= rk[4 + i];
                }
        }
 #else
-       t[0] =  Te0[(s0      ) & 0xff] ^
-               Te1[(s1 >>  8) & 0xff] ^
-               Te2[(s2 >> 16) & 0xff] ^
-               Te3[(s3 >> 24)       ] ^
-               rk[4];
-       t[1] =  Te0[(s1      ) & 0xff] ^
-               Te1[(s2 >>  8) & 0xff] ^
-               Te2[(s3 >> 16) & 0xff] ^
-               Te3[(s0 >> 24)       ] ^
-               rk[5];
-       t[2] =  Te0[(s2      ) & 0xff] ^
-               Te1[(s3 >>  8) & 0xff] ^
-               Te2[(s0 >> 16) & 0xff] ^
-               Te3[(s1 >> 24)       ] ^
-               rk[6];
-       t[3] =  Te0[(s3      ) & 0xff] ^
-               Te1[(s0 >>  8) & 0xff] ^
-               Te2[(s1 >> 16) & 0xff] ^
-               Te3[(s2 >> 24)       ] ^
-               rk[7];
+       t[0] = Te0[(s0) & 0xff] ^
+           Te1[(s1 >> 8) & 0xff] ^
+           Te2[(s2 >> 16) & 0xff] ^
+           Te3[(s3 >> 24)] ^
+           rk[4];
+       t[1] = Te0[(s1) & 0xff] ^
+           Te1[(s2 >> 8) & 0xff] ^
+           Te2[(s3 >> 16) & 0xff] ^
+           Te3[(s0 >> 24)] ^
+           rk[5];
+       t[2] = Te0[(s2) & 0xff] ^
+           Te1[(s3 >> 8) & 0xff] ^
+           Te2[(s0 >> 16) & 0xff] ^
+           Te3[(s1 >> 24)] ^
+           rk[6];
+       t[3] = Te0[(s3) & 0xff] ^
+           Te1[(s0 >> 8) & 0xff] ^
+           Te2[(s1 >> 16) & 0xff] ^
+           Te3[(s2 >> 24)] ^
+           rk[7];
 #endif
-       s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+       s0 = t[0];
+       s1 = t[1];
+       s2 = t[2];
+       s3 = t[3];
 
     /*
      * Nr - 2 full rounds:
      */
-    for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
+       for (rk += 8, r = key->rounds - 2; r > 0; rk += 4, r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-       t[0] =  Te4[(s0      ) & 0xff]       ^
-               Te4[(s1 >>  8) & 0xff] <<  8 ^
-               Te4[(s2 >> 16) & 0xff] << 16 ^
-               Te4[(s3 >> 24)       ] << 24;
-       t[1] =  Te4[(s1      ) & 0xff]       ^
-               Te4[(s2 >>  8) & 0xff] <<  8 ^
-               Te4[(s3 >> 16) & 0xff] << 16 ^
-               Te4[(s0 >> 24)       ] << 24;
-       t[2] =  Te4[(s2      ) & 0xff]       ^
-               Te4[(s3 >>  8) & 0xff] <<  8 ^
-               Te4[(s0 >> 16) & 0xff] << 16 ^
-               Te4[(s1 >> 24)       ] << 24;
-       t[3] =  Te4[(s3      ) & 0xff]       ^
-               Te4[(s0 >>  8) & 0xff] <<  8 ^
-               Te4[(s1 >> 16) & 0xff] << 16 ^
-               Te4[(s2 >> 24)       ] << 24;
+               t[0] = Te4[(s0) & 0xff] ^
+                   Te4[(s1 >> 8) & 0xff] << 8 ^
+                   Te4[(s2 >> 16) & 0xff] << 16 ^
+                   Te4[(s3 >> 24)] << 24;
+               t[1] = Te4[(s1) & 0xff] ^
+                   Te4[(s2 >> 8) & 0xff] << 8 ^
+                   Te4[(s3 >> 16) & 0xff] << 16 ^
+                   Te4[(s0 >> 24)] << 24;
+               t[2] = Te4[(s2) & 0xff] ^
+                   Te4[(s3 >> 8) & 0xff] << 8 ^
+                   Te4[(s0 >> 16) & 0xff] << 16 ^
+                   Te4[(s1 >> 24)] << 24;
+               t[3] = Te4[(s3) & 0xff] ^
+                   Te4[(s0 >> 8) & 0xff] << 8 ^
+                   Te4[(s1 >> 16) & 0xff] << 16 ^
+                   Te4[(s2 >> 24)] << 24;
 
-       /* now do the linear transform using words */
-       {       int i;
-               u32 r0, r1, r2;
+               /* now do the linear transform using words */
+               {
+                       int i;
+                       u32 r0, r1, r2;
 
-               for (i = 0; i < 4; i++) {
-                       r0 = t[i];
-                       r1 = r0 & 0x80808080;
-                       r2 = ((r0 & 0x7f7f7f7f) << 1) ^
-                               ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
+                       for (i = 0; i < 4; i++) {
+                               r0 = t[i];
+                               r1 = r0 & 0x80808080;
+                               r2 = ((r0 & 0x7f7f7f7f) << 1) ^
+                                   ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
 #if defined(ROTATE)
-                       t[i] = r2 ^ ROTATE(r2,24) ^ ROTATE(r0,24) ^
-                               ROTATE(r0,16) ^ ROTATE(r0,8);
+                               t[i] = r2 ^ ROTATE(r2, 24) ^ ROTATE(r0, 24) ^
+                                   ROTATE(r0, 16) ^ ROTATE(r0, 8);
 #else
-                       t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^
-                               (r0 << 16) ^ (r0 >> 16) ^
-                               (r0 << 8) ^ (r0 >> 24);
+                               t[i] = r2 ^ ((r2 ^ r0) << 24) ^
+                                   ((r2 ^ r0) >> 8) ^
+                                   (r0 << 16) ^ (r0 >> 16) ^
+                                   (r0 << 8) ^ (r0 >> 24);
 #endif
-                       t[i] ^= rk[i];
+                               t[i] ^= rk[i];
+                       }
                }
-       }
 #else
-       t[0] =  Te0[(s0      ) & 0xff] ^
-               Te1[(s1 >>  8) & 0xff] ^
-               Te2[(s2 >> 16) & 0xff] ^
-               Te3[(s3 >> 24)       ] ^
-               rk[0];
-       t[1] =  Te0[(s1      ) & 0xff] ^
-               Te1[(s2 >>  8) & 0xff] ^
-               Te2[(s3 >> 16) & 0xff] ^
-               Te3[(s0 >> 24)       ] ^
-               rk[1];
-       t[2] =  Te0[(s2      ) & 0xff] ^
-               Te1[(s3 >>  8) & 0xff] ^
-               Te2[(s0 >> 16) & 0xff] ^
-               Te3[(s1 >> 24)       ] ^
-               rk[2];
-       t[3] =  Te0[(s3      ) & 0xff] ^
-               Te1[(s0 >>  8) & 0xff] ^
-               Te2[(s1 >> 16) & 0xff] ^
-               Te3[(s2 >> 24)       ] ^
-               rk[3];
+               t[0] = Te0[(s0) & 0xff] ^
+                   Te1[(s1 >> 8) & 0xff] ^
+                   Te2[(s2 >> 16) & 0xff] ^
+                   Te3[(s3 >> 24)] ^
+                   rk[0];
+               t[1] = Te0[(s1) & 0xff] ^
+                   Te1[(s2 >> 8) & 0xff] ^
+                   Te2[(s3 >> 16) & 0xff] ^
+                   Te3[(s0 >> 24)] ^
+                   rk[1];
+               t[2] = Te0[(s2) & 0xff] ^
+                   Te1[(s3 >> 8) & 0xff] ^
+                   Te2[(s0 >> 16) & 0xff] ^
+                   Te3[(s1 >> 24)] ^
+                   rk[2];
+               t[3] = Te0[(s3) & 0xff] ^
+                   Te1[(s0 >> 8) & 0xff] ^
+                   Te2[(s1 >> 16) & 0xff] ^
+                   Te3[(s2 >> 24)] ^
+                   rk[3];
 #endif
-       s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
-    }
-    /*
+               s0 = t[0];
+               s1 = t[1];
+               s2 = t[2];
+               s3 = t[3];
+       }
+       /*
         * apply last round and
         * map cipher state to byte array block:
         */
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
        prefetch256(Te4);
 
-       *(u32*)(out+0) =
-               Te4[(s0      ) & 0xff]       ^
-               Te4[(s1 >>  8) & 0xff] <<  8 ^
-               Te4[(s2 >> 16) & 0xff] << 16 ^
-               Te4[(s3 >> 24)       ] << 24 ^
-               rk[0];
-       *(u32*)(out+4) =
-               Te4[(s1      ) & 0xff]       ^
-               Te4[(s2 >>  8) & 0xff] <<  8 ^
-               Te4[(s3 >> 16) & 0xff] << 16 ^
-               Te4[(s0 >> 24)       ] << 24 ^
-               rk[1];
-       *(u32*)(out+8) =
-               Te4[(s2      ) & 0xff]       ^
-               Te4[(s3 >>  8) & 0xff] <<  8 ^
-               Te4[(s0 >> 16) & 0xff] << 16 ^
-               Te4[(s1 >> 24)       ] << 24 ^
-               rk[2];
-       *(u32*)(out+12) =
-               Te4[(s3      ) & 0xff]       ^
-               Te4[(s0 >>  8) & 0xff] <<  8 ^
-               Te4[(s1 >> 16) & 0xff] << 16 ^
-               Te4[(s2 >> 24)       ] << 24 ^
-               rk[3];
+       *(u32*)(out + 0) =
+           Te4[(s0) & 0xff] ^
+           Te4[(s1 >> 8) & 0xff] << 8 ^
+           Te4[(s2 >> 16) & 0xff] << 16 ^
+           Te4[(s3 >> 24)] << 24 ^
+           rk[0];
+       *(u32*)(out + 4) =
+           Te4[(s1) & 0xff] ^
+           Te4[(s2 >> 8) & 0xff] << 8 ^
+           Te4[(s3 >> 16) & 0xff] << 16 ^
+           Te4[(s0 >> 24)] << 24 ^
+           rk[1];
+       *(u32*)(out + 8) =
+           Te4[(s2) & 0xff] ^
+           Te4[(s3 >> 8) & 0xff] << 8 ^
+           Te4[(s0 >> 16) & 0xff] << 16 ^
+           Te4[(s1 >> 24)] << 24 ^
+           rk[2];
+       *(u32*)(out + 12) =
+           Te4[(s3) & 0xff] ^
+           Te4[(s0 >> 8) & 0xff] << 8 ^
+           Te4[(s1 >> 16) & 0xff] << 16 ^
+           Te4[(s2 >> 24)] << 24 ^
+           rk[3];
 #else
-       *(u32*)(out+0) =
-               (Te2[(s0      ) & 0xff] & 0x000000ffU) ^
-               (Te3[(s1 >>  8) & 0xff] & 0x0000ff00U) ^
-               (Te0[(s2 >> 16) & 0xff] & 0x00ff0000U) ^
-               (Te1[(s3 >> 24)       ] & 0xff000000U) ^
-               rk[0];
-       *(u32*)(out+4) =
-               (Te2[(s1      ) & 0xff] & 0x000000ffU) ^
-               (Te3[(s2 >>  8) & 0xff] & 0x0000ff00U) ^
-               (Te0[(s3 >> 16) & 0xff] & 0x00ff0000U) ^
-               (Te1[(s0 >> 24)       ] & 0xff000000U) ^
-               rk[1];
-       *(u32*)(out+8) =
-               (Te2[(s2      ) & 0xff] & 0x000000ffU) ^
-               (Te3[(s3 >>  8) & 0xff] & 0x0000ff00U) ^
-               (Te0[(s0 >> 16) & 0xff] & 0x00ff0000U) ^
-               (Te1[(s1 >> 24)       ] & 0xff000000U) ^
-               rk[2];
-       *(u32*)(out+12) =
-               (Te2[(s3      ) & 0xff] & 0x000000ffU) ^
-               (Te3[(s0 >>  8) & 0xff] & 0x0000ff00U) ^
-               (Te0[(s1 >> 16) & 0xff] & 0x00ff0000U) ^
-               (Te1[(s2 >> 24)       ] & 0xff000000U) ^
-               rk[3];
+       *(u32*)(out + 0) =
+           (Te2[(s0) & 0xff] & 0x000000ffU) ^
+           (Te3[(s1 >> 8) & 0xff] & 0x0000ff00U) ^
+           (Te0[(s2 >> 16) & 0xff] & 0x00ff0000U) ^
+           (Te1[(s3 >> 24)] & 0xff000000U) ^
+           rk[0];
+       *(u32*)(out + 4) =
+           (Te2[(s1) & 0xff] & 0x000000ffU) ^
+           (Te3[(s2 >> 8) & 0xff] & 0x0000ff00U) ^
+           (Te0[(s3 >> 16) & 0xff] & 0x00ff0000U) ^
+           (Te1[(s0 >> 24)] & 0xff000000U) ^
+           rk[1];
+       *(u32*)(out + 8) =
+           (Te2[(s2) & 0xff] & 0x000000ffU) ^
+           (Te3[(s3 >> 8) & 0xff] & 0x0000ff00U) ^
+           (Te0[(s0 >> 16) & 0xff] & 0x00ff0000U) ^
+           (Te1[(s1 >> 24)] & 0xff000000U) ^
+           rk[2];
+       *(u32*)(out + 12) =
+           (Te2[(s3) & 0xff] & 0x000000ffU) ^
+           (Te3[(s0 >> 8) & 0xff] & 0x0000ff00U) ^
+           (Te0[(s1 >> 16) & 0xff] & 0x00ff0000U) ^
+           (Te1[(s2 >> 24)] & 0xff000000U) ^
+           rk[3];
 #endif
 }
 
@@ -861,9 +879,9 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
  * Decrypt a single block
  * in and out can overlap
  */
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-                const AES_KEY *key) {
-
+void
+AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
+{
        const u32 *rk;
        u32 s0, s1, s2, s3, t[4];
        int r;
@@ -875,7 +893,7 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
         * map byte array block to cipher state
         * and add initial round key:
         */
-       s0 = GETU32(in     ) ^ rk[0];
+       s0 = GETU32(in) ^ rk[0];
        s1 = GETU32(in +  4) ^ rk[1];
        s2 = GETU32(in +  8) ^ rk[2];
        s3 = GETU32(in + 12) ^ rk[3];
@@ -883,181 +901,188 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
        prefetch256(Td4);
 
-        t[0] = Td4[(s0      ) & 0xff]       ^
-               Td4[(s3 >>  8) & 0xff] <<  8 ^
-               Td4[(s2 >> 16) & 0xff] << 16 ^
-               Td4[(s1 >> 24)       ] << 24;
-        t[1] = Td4[(s1      ) & 0xff]       ^
-               Td4[(s0 >>  8) & 0xff] <<  8 ^
-               Td4[(s3 >> 16) & 0xff] << 16 ^
-               Td4[(s2 >> 24)       ] << 24;
-        t[2] = Td4[(s2      ) & 0xff]       ^
-               Td4[(s1 >>  8) & 0xff] <<  8 ^
-               Td4[(s0 >> 16) & 0xff] << 16 ^
-               Td4[(s3 >> 24)       ] << 24;
-        t[3] = Td4[(s3      ) & 0xff]       ^
-               Td4[(s2 >>  8) & 0xff] <<  8 ^
-               Td4[(s1 >> 16) & 0xff] << 16 ^
-               Td4[(s0 >> 24)       ] << 24;
+       t[0] = Td4[(s0) & 0xff] ^
+           Td4[(s3 >> 8) & 0xff] << 8 ^
+           Td4[(s2 >> 16) & 0xff] << 16 ^
+           Td4[(s1 >> 24)] << 24;
+       t[1] = Td4[(s1) & 0xff] ^
+           Td4[(s0 >> 8) & 0xff] << 8 ^
+           Td4[(s3 >> 16) & 0xff] << 16 ^
+           Td4[(s2 >> 24)] << 24;
+       t[2] = Td4[(s2) & 0xff] ^
+           Td4[(s1 >> 8) & 0xff] << 8 ^
+           Td4[(s0 >> 16) & 0xff] << 16 ^
+           Td4[(s3 >> 24)] << 24;
+       t[3] = Td4[(s3) & 0xff] ^
+           Td4[(s2 >> 8) & 0xff] << 8 ^
+           Td4[(s1 >> 16) & 0xff] << 16 ^
+           Td4[(s0 >> 24)] << 24;
 
-       /* now do the linear transform using words */ 
-       {       int i;
+       /* now do the linear transform using words */
+       {
+               int i;
                u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
 
                for (i = 0; i < 4; i++) {
                        tp1 = t[i];
                        m = tp1 & 0x80808080;
                        tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp2 & 0x80808080;
                        tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp4 & 0x80808080;
                        tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        tp9 = tp8 ^ tp1;
                        tpb = tp9 ^ tp2;
                        tpd = tp9 ^ tp4;
                        tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-                       t[i] = tpe ^ ROTATE(tpd,16) ^
-                               ROTATE(tp9,8) ^ ROTATE(tpb,24);
+                       t[i] = tpe ^ ROTATE(tpd, 16) ^
+                           ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-                       t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-                               (tp9 >> 24) ^ (tp9 << 8) ^
-                               (tpb >> 8) ^ (tpb << 24);
+                       t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
+                           (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24);
 #endif
-                       t[i] ^= rk[4+i];
+                       t[i] ^= rk[4 + i];
                }
        }
 #else
-       t[0] =  Td0[(s0      ) & 0xff] ^
-               Td1[(s3 >>  8) & 0xff] ^
-               Td2[(s2 >> 16) & 0xff] ^
-               Td3[(s1 >> 24)       ] ^
-               rk[4];
-       t[1] =  Td0[(s1      ) & 0xff] ^
-               Td1[(s0 >>  8) & 0xff] ^
-               Td2[(s3 >> 16) & 0xff] ^
-               Td3[(s2 >> 24)       ] ^
-               rk[5];
-       t[2] =  Td0[(s2      ) & 0xff] ^
-               Td1[(s1 >>  8) & 0xff] ^
-               Td2[(s0 >> 16) & 0xff] ^
-               Td3[(s3 >> 24)       ] ^
-               rk[6];
-       t[3] =  Td0[(s3      ) & 0xff] ^
-               Td1[(s2 >>  8) & 0xff] ^
-               Td2[(s1 >> 16) & 0xff] ^
-               Td3[(s0 >> 24)       ] ^
-               rk[7];
+       t[0] = Td0[(s0) & 0xff] ^
+           Td1[(s3 >> 8) & 0xff] ^
+           Td2[(s2 >> 16) & 0xff] ^
+           Td3[(s1 >> 24)] ^
+           rk[4];
+       t[1] = Td0[(s1) & 0xff] ^
+           Td1[(s0 >> 8) & 0xff] ^
+           Td2[(s3 >> 16) & 0xff] ^
+           Td3[(s2 >> 24)] ^
+           rk[5];
+       t[2] = Td0[(s2) & 0xff] ^
+           Td1[(s1 >> 8) & 0xff] ^
+           Td2[(s0 >> 16) & 0xff] ^
+           Td3[(s3 >> 24)] ^
+           rk[6];
+       t[3] = Td0[(s3) & 0xff] ^
+           Td1[(s2 >> 8) & 0xff] ^
+           Td2[(s1 >> 16) & 0xff] ^
+           Td3[(s0 >> 24)] ^
+           rk[7];
 #endif
-       s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+       s0 = t[0];
+       s1 = t[1];
+       s2 = t[2];
+       s3 = t[3];
 
     /*
      * Nr - 2 full rounds:
      */
-    for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
+       for (rk += 8, r = key->rounds - 2; r > 0; rk += 4, r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] = Td4[(s0      ) & 0xff]       ^
-               Td4[(s3 >>  8) & 0xff] <<  8 ^
-               Td4[(s2 >> 16) & 0xff] << 16 ^
-               Td4[(s1 >> 24)       ] << 24;
-        t[1] = Td4[(s1      ) & 0xff]       ^
-               Td4[(s0 >>  8) & 0xff] <<  8 ^
-               Td4[(s3 >> 16) & 0xff] << 16 ^
-               Td4[(s2 >> 24)       ] << 24;
-        t[2] = Td4[(s2      ) & 0xff]       ^
-               Td4[(s1 >>  8) & 0xff] <<  8 ^
-               Td4[(s0 >> 16) & 0xff] << 16 ^
-               Td4[(s3 >> 24)       ] << 24;
-        t[3] = Td4[(s3      ) & 0xff]       ^
-               Td4[(s2 >>  8) & 0xff] <<  8 ^
-               Td4[(s1 >> 16) & 0xff] << 16 ^
-               Td4[(s0 >> 24)       ] << 24;
+               t[0] = Td4[(s0) & 0xff] ^
+                   Td4[(s3 >> 8) & 0xff] << 8 ^
+                   Td4[(s2 >> 16) & 0xff] << 16 ^
+                   Td4[(s1 >> 24)] << 24;
+               t[1] = Td4[(s1) & 0xff] ^
+                   Td4[(s0 >> 8) & 0xff] << 8 ^
+                   Td4[(s3 >> 16) & 0xff] << 16 ^
+                   Td4[(s2 >> 24)] << 24;
+               t[2] = Td4[(s2) & 0xff] ^
+                   Td4[(s1 >> 8) & 0xff] << 8 ^
+                   Td4[(s0 >> 16) & 0xff] << 16 ^
+                   Td4[(s3 >> 24)] << 24;
+               t[3] = Td4[(s3) & 0xff] ^
+                   Td4[(s2 >> 8) & 0xff] << 8 ^
+                   Td4[(s1 >> 16) & 0xff] << 16 ^
+                   Td4[(s0 >> 24)] << 24;
 
-       /* now do the linear transform using words */ 
-       {       int i;
-               u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
+               /* now do the linear transform using words */
+               {
+                       int i;
+                       u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
 
-               for (i = 0; i < 4; i++) {
-                       tp1 = t[i];
-                       m = tp1 & 0x80808080;
-                       tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
-                       m = tp2 & 0x80808080;
-                       tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
-                       m = tp4 & 0x80808080;
-                       tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
-                       tp9 = tp8 ^ tp1;
-                       tpb = tp9 ^ tp2;
-                       tpd = tp9 ^ tp4;
-                       tpe = tp8 ^ tp4 ^ tp2;
+                       for (i = 0; i < 4; i++) {
+                               tp1 = t[i];
+                               m = tp1 & 0x80808080;
+                               tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
+                                   ((m - (m >> 7)) & 0x1b1b1b1b);
+                               m = tp2 & 0x80808080;
+                               tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
+                                   ((m - (m >> 7)) & 0x1b1b1b1b);
+                               m = tp4 & 0x80808080;
+                                   tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
+                                   ((m - (m >> 7)) & 0x1b1b1b1b);
+                               tp9 = tp8 ^ tp1;
+                               tpb = tp9 ^ tp2;
+                               tpd = tp9 ^ tp4;
+                               tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-                       t[i] = tpe ^ ROTATE(tpd,16) ^
-                               ROTATE(tp9,8) ^ ROTATE(tpb,24);
+                               t[i] = tpe ^ ROTATE(tpd, 16) ^
+                                   ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-                       t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-                               (tp9 >> 24) ^ (tp9 << 8) ^
-                               (tpb >> 8) ^ (tpb << 24);
+                               t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
+                                   (tp9 >> 24) ^ (tp9 << 8) ^
+                                   (tpb >> 8) ^ (tpb << 24);
 #endif
-                       t[i] ^= rk[i];
+                               t[i] ^= rk[i];
+                       }
                }
-       }
 #else
-       t[0] =  Td0[(s0      ) & 0xff] ^
-               Td1[(s3 >>  8) & 0xff] ^
-               Td2[(s2 >> 16) & 0xff] ^
-               Td3[(s1 >> 24)       ] ^
-               rk[0];
-       t[1] =  Td0[(s1      ) & 0xff] ^
-               Td1[(s0 >>  8) & 0xff] ^
-               Td2[(s3 >> 16) & 0xff] ^
-               Td3[(s2 >> 24)       ] ^
-               rk[1];
-       t[2] =  Td0[(s2      ) & 0xff] ^
-               Td1[(s1 >>  8) & 0xff] ^
-               Td2[(s0 >> 16) & 0xff] ^
-               Td3[(s3 >> 24)       ] ^
-               rk[2];
-       t[3] =  Td0[(s3      ) & 0xff] ^
-               Td1[(s2 >>  8) & 0xff] ^
-               Td2[(s1 >> 16) & 0xff] ^
-               Td3[(s0 >> 24)       ] ^
-               rk[3];
+               t[0] = Td0[(s0) & 0xff] ^
+                   Td1[(s3 >> 8) & 0xff] ^
+                   Td2[(s2 >> 16) & 0xff] ^
+                   Td3[(s1 >> 24)] ^
+                   rk[0];
+               t[1] = Td0[(s1) & 0xff] ^
+                   Td1[(s0 >>  8) & 0xff] ^
+                   Td2[(s3 >> 16) & 0xff] ^
+                   Td3[(s2 >> 24)] ^
+                   rk[1];
+               t[2] = Td0[(s2) & 0xff] ^
+                   Td1[(s1 >> 8) & 0xff] ^
+                   Td2[(s0 >> 16) & 0xff] ^
+                   Td3[(s3 >> 24)] ^
+                   rk[2];
+               t[3] = Td0[(s3) & 0xff] ^
+                   Td1[(s2 >> 8) & 0xff] ^
+                   Td2[(s1 >> 16) & 0xff] ^
+                   Td3[(s0 >> 24)] ^
+                   rk[3];
 #endif
-       s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
-    }
-    /*
+               s0 = t[0];
+               s1 = t[1];
+               s2 = t[2];
+               s3 = t[3];
+       }
+       /*
         * apply last round and
         * map cipher state to byte array block:
         */
        prefetch256(Td4);
 
-       *(u32*)(out+0) =
-               (Td4[(s0      ) & 0xff])        ^
-               (Td4[(s3 >>  8) & 0xff] <<  8) ^
-               (Td4[(s2 >> 16) & 0xff] << 16) ^
-               (Td4[(s1 >> 24)       ] << 24) ^
-               rk[0];
-       *(u32*)(out+4) =
-               (Td4[(s1      ) & 0xff])         ^
-               (Td4[(s0 >>  8) & 0xff] <<  8) ^
-               (Td4[(s3 >> 16) & 0xff] << 16) ^
-               (Td4[(s2 >> 24)       ] << 24) ^
-               rk[1];
-       *(u32*)(out+8) =
-               (Td4[(s2      ) & 0xff])         ^
-               (Td4[(s1 >>  8) & 0xff] <<  8) ^
-               (Td4[(s0 >> 16) & 0xff] << 16) ^
-               (Td4[(s3 >> 24)       ] << 24) ^
-               rk[2];
-       *(u32*)(out+12) =
-               (Td4[(s3      ) & 0xff])         ^
-               (Td4[(s2 >>  8) & 0xff] <<  8) ^
-               (Td4[(s1 >> 16) & 0xff] << 16) ^
-               (Td4[(s0 >> 24)       ] << 24) ^
-               rk[3];
+       *(u32*)(out + 0) =
+           (Td4[(s0) & 0xff]) ^
+           (Td4[(s3 >> 8) & 0xff] << 8) ^
+           (Td4[(s2 >> 16) & 0xff] << 16) ^
+           (Td4[(s1 >> 24)] << 24) ^
+           rk[0];
+       *(u32*)(out + 4) =
+           (Td4[(s1) & 0xff]) ^
+           (Td4[(s0 >> 8) & 0xff] << 8) ^
+           (Td4[(s3 >> 16) & 0xff] << 16) ^
+           (Td4[(s2 >> 24)] << 24) ^
+           rk[1];
+       *(u32*)(out + 8) =
+           (Td4[(s2) & 0xff]) ^
+           (Td4[(s1 >>  8) & 0xff] << 8) ^
+           (Td4[(s0 >> 16) & 0xff] << 16) ^
+           (Td4[(s3 >> 24)] << 24) ^
+           rk[2];
+       *(u32*)(out + 12) =
+           (Td4[(s3) & 0xff]) ^
+           (Td4[(s2 >> 8) & 0xff] << 8) ^
+           (Td4[(s1 >> 16) & 0xff] << 16) ^
+           (Td4[(s0 >> 24)] << 24) ^
+           rk[3];
 }
index 031abf0..4d477bd 100644 (file)
@@ -75,69 +75,61 @@ extern "C" {
 /* This should be a hidden type, but EVP requires that the size be known */
 struct aes_key_st {
 #ifdef AES_LONG
-    unsigned long rd_key[4 *(AES_MAXNR + 1)];
+       unsigned long rd_key[4 *(AES_MAXNR + 1)];
 #else
-    unsigned int rd_key[4 *(AES_MAXNR + 1)];
+       unsigned int rd_key[4 *(AES_MAXNR + 1)];
 #endif
-    int rounds;
+       int rounds;
 };
 typedef struct aes_key_st AES_KEY;
 
 const char *AES_options(void);
 
 int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-       AES_KEY *key);
+    AES_KEY *key);
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-       AES_KEY *key);
+    AES_KEY *key);
 
 int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-       AES_KEY *key);
+    AES_KEY *key);
 int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-       AES_KEY *key);
+    AES_KEY *key);
 
 void AES_encrypt(const unsigned char *in, unsigned char *out,
-       const AES_KEY *key);
+    const AES_KEY *key);
 void AES_decrypt(const unsigned char *in, unsigned char *out,
-       const AES_KEY *key);
+    const AES_KEY *key);
 
 void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-       const AES_KEY *key, const int enc);
+    const AES_KEY *key, const int enc);
 void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, const int enc);
 void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num,
+    const int enc);
 void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num);
+    size_t length, const AES_KEY *key, unsigned char *ivec, int *num);
 void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char ivec[AES_BLOCK_SIZE],
-       unsigned char ecount_buf[AES_BLOCK_SIZE],
-       unsigned int *num);
+    size_t length, const AES_KEY *key, unsigned char ivec[AES_BLOCK_SIZE],
+    unsigned char ecount_buf[AES_BLOCK_SIZE], unsigned int *num);
 /* NB: the IV is _two_ blocks long */
 void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                    size_t length, const AES_KEY *key,
-                    unsigned char *ivec, const int enc);
+    size_t length, const AES_KEY *key, unsigned char *ivec, const int enc);
 /* NB: the IV is _four_ blocks long */
 void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const AES_KEY *key,
-                       const AES_KEY *key2, const unsigned char *ivec,
-                       const int enc);
-
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, unsigned int inlen);
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, unsigned int inlen);
+    size_t length, const AES_KEY *key, const AES_KEY *key2,
+    const unsigned char *ivec, const int enc);
+
+int AES_wrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen);
+int AES_unwrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen);
 
 
 #ifdef  __cplusplus
index 227f756..9430e04 100644 (file)
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 
-void AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
-                    size_t len, const AES_KEY *key,
-                    unsigned char *ivec, const int enc) {
-
+void
+AES_cbc_encrypt(const unsigned char *in, unsigned char *out,
+    size_t len, const AES_KEY *key, unsigned char *ivec, const int enc)
+{
        if (enc)
-               CRYPTO_cbc128_encrypt(in,out,len,key,ivec,(block128_f)AES_encrypt);
+               CRYPTO_cbc128_encrypt(in, out, len, key, ivec,
+                   (block128_f)AES_encrypt);
        else
-               CRYPTO_cbc128_decrypt(in,out,len,key,ivec,(block128_f)AES_decrypt);
+               CRYPTO_cbc128_decrypt(in, out, len, key, ivec,
+                   (block128_f)AES_decrypt);
 }
index 0c6d058..b496a04 100644 (file)
  * 128bit block we have used is contained in *num;
  */
 
-void AES_cfb128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num, const int enc) {
-
-       CRYPTO_cfb128_encrypt(in,out,length,key,ivec,num,enc,(block128_f)AES_encrypt);
+void
+AES_cfb128_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
+{
+       CRYPTO_cfb128_encrypt(in, out, length, key, ivec, num, enc,
+           (block128_f)AES_encrypt);
 }
 
 /* N.B. This expects the input to be packed, MS bit first */
-void AES_cfb1_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, int *num, const int enc)
-    {
-    CRYPTO_cfb128_1_encrypt(in,out,length,key,ivec,num,enc,(block128_f)AES_encrypt);
-    }
+void
+AES_cfb1_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
+{
+       CRYPTO_cfb128_1_encrypt(in, out, length, key, ivec, num, enc,
+           (block128_f)AES_encrypt);
+}
 
-void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
-                     size_t length, const AES_KEY *key,
-                     unsigned char *ivec, int *num, const int enc)
-    {
-    CRYPTO_cfb128_8_encrypt(in,out,length,key,ivec,num,enc,(block128_f)AES_encrypt);
-    }
+void
+AES_cfb8_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, int *num, const int enc)
+{
+       CRYPTO_cfb128_8_encrypt(in, out, length, key, ivec, num, enc,
+           (block128_f)AES_encrypt);
+}
 
index 8f5210a..05ffbfb 100644 (file)
@@ -54,567 +54,567 @@ Td4[x] = Si[x].[01];
 */
 
 static const u32 Te0[256] = {
-    0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-    0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-    0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-    0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-    0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-    0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-    0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-    0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-    0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-    0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-    0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-    0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-    0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-    0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-    0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-    0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-    0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-    0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-    0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-    0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-    0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-    0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-    0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-    0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-    0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-    0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-    0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-    0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-    0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-    0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-    0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-    0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-    0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-    0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-    0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-    0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-    0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-    0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-    0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-    0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-    0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-    0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-    0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-    0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-    0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-    0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-    0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-    0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-    0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-    0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-    0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-    0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-    0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-    0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-    0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-    0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-    0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-    0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-    0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-    0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-    0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-    0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-    0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-    0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
+       0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
+       0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
+       0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
+       0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
+       0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
+       0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
+       0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
+       0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
+       0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
+       0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
+       0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
+       0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
+       0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
+       0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
+       0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
+       0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
+       0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
+       0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
+       0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
+       0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
+       0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
+       0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
+       0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
+       0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
+       0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
+       0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
+       0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
+       0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
+       0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
+       0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
+       0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
+       0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
+       0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
+       0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
+       0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
+       0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
+       0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
+       0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
+       0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
+       0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
+       0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
+       0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
+       0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
+       0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
+       0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
+       0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
+       0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
+       0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
+       0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
+       0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
+       0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
+       0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
+       0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
+       0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
+       0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
+       0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
+       0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
+       0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
+       0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
+       0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
+       0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
+       0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
+       0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
+       0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
 };
 static const u32 Te1[256] = {
-    0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-    0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-    0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-    0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-    0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-    0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-    0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-    0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-    0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-    0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-    0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-    0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-    0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-    0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-    0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-    0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-    0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-    0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-    0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-    0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-    0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-    0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-    0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-    0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-    0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-    0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-    0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-    0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-    0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-    0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-    0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-    0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-    0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-    0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-    0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-    0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-    0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-    0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-    0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-    0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-    0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-    0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-    0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-    0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-    0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-    0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-    0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-    0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-    0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-    0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-    0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-    0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-    0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-    0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-    0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-    0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-    0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-    0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-    0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-    0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-    0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-    0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-    0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-    0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
+       0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
+       0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
+       0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
+       0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
+       0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
+       0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
+       0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
+       0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
+       0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
+       0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
+       0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
+       0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
+       0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
+       0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
+       0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
+       0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
+       0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
+       0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
+       0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
+       0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
+       0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
+       0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
+       0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
+       0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
+       0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
+       0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
+       0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
+       0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
+       0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
+       0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
+       0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
+       0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
+       0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
+       0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
+       0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
+       0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
+       0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
+       0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
+       0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
+       0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
+       0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
+       0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
+       0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
+       0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
+       0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
+       0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
+       0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
+       0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
+       0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
+       0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
+       0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
+       0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
+       0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
+       0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
+       0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
+       0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
+       0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
+       0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
+       0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
+       0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
+       0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
+       0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
+       0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
+       0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
 };
 static const u32 Te2[256] = {
-    0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-    0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-    0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-    0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-    0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-    0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-    0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-    0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-    0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-    0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-    0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-    0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-    0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-    0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-    0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-    0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-    0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-    0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-    0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-    0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-    0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-    0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-    0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-    0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-    0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-    0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-    0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-    0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-    0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-    0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-    0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-    0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-    0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-    0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-    0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-    0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-    0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-    0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-    0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-    0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-    0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-    0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-    0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-    0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-    0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-    0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-    0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-    0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-    0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-    0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-    0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-    0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-    0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-    0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-    0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-    0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-    0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-    0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-    0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-    0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-    0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-    0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-    0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-    0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
+       0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
+       0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
+       0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
+       0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
+       0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
+       0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
+       0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
+       0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
+       0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
+       0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
+       0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
+       0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
+       0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
+       0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
+       0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
+       0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
+       0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
+       0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
+       0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
+       0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
+       0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
+       0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
+       0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
+       0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
+       0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
+       0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
+       0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
+       0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
+       0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
+       0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
+       0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
+       0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
+       0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
+       0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
+       0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
+       0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
+       0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
+       0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
+       0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
+       0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
+       0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
+       0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
+       0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
+       0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
+       0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
+       0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
+       0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
+       0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
+       0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
+       0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
+       0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
+       0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
+       0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
+       0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
+       0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
+       0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
+       0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
+       0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
+       0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
+       0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
+       0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
+       0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
+       0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
+       0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
 };
 static const u32 Te3[256] = {
-    0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-    0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-    0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-    0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-    0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-    0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-    0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-    0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-    0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-    0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-    0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-    0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-    0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-    0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-    0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-    0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-    0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-    0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-    0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-    0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-    0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-    0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-    0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-    0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-    0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-    0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-    0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-    0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-    0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-    0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-    0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-    0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-    0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-    0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-    0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-    0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-    0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-    0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-    0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-    0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-    0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-    0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-    0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-    0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-    0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-    0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-    0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-    0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-    0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-    0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-    0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-    0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-    0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-    0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-    0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-    0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-    0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-    0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-    0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-    0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-    0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-    0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-    0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-    0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
+       0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
+       0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
+       0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
+       0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
+       0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
+       0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
+       0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
+       0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
+       0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
+       0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
+       0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
+       0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
+       0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
+       0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
+       0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
+       0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
+       0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
+       0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
+       0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
+       0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
+       0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
+       0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
+       0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
+       0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
+       0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
+       0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
+       0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
+       0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
+       0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
+       0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
+       0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
+       0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
+       0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
+       0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
+       0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
+       0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
+       0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
+       0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
+       0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
+       0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
+       0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
+       0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
+       0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
+       0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
+       0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
+       0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
+       0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
+       0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
+       0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
+       0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
+       0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
+       0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
+       0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
+       0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
+       0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
+       0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
+       0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
+       0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
+       0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
+       0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
+       0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
+       0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
+       0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
+       0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
 };
 
 static const u32 Td0[256] = {
-    0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-    0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-    0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-    0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-    0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-    0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-    0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-    0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-    0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-    0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-    0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-    0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-    0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-    0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-    0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-    0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-    0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-    0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-    0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-    0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-    0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-    0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-    0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-    0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-    0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-    0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-    0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-    0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-    0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-    0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-    0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-    0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-    0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-    0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-    0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-    0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-    0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-    0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-    0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-    0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-    0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-    0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-    0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-    0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-    0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-    0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-    0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-    0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-    0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-    0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-    0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-    0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-    0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-    0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-    0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-    0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-    0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-    0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-    0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-    0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-    0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-    0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-    0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-    0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
+       0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
+       0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
+       0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
+       0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
+       0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
+       0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
+       0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
+       0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
+       0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
+       0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
+       0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
+       0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
+       0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
+       0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
+       0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
+       0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
+       0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
+       0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
+       0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
+       0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
+       0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
+       0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
+       0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
+       0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
+       0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
+       0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
+       0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
+       0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
+       0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
+       0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
+       0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
+       0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
+       0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
+       0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
+       0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
+       0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
+       0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
+       0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
+       0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
+       0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
+       0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
+       0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
+       0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
+       0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
+       0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
+       0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
+       0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
+       0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
+       0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
+       0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
+       0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
+       0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
+       0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
+       0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
+       0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
+       0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
+       0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
+       0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
+       0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
+       0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
+       0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
+       0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
+       0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
+       0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
 };
 static const u32 Td1[256] = {
-    0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-    0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-    0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-    0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-    0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-    0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-    0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-    0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-    0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-    0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-    0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-    0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-    0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-    0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-    0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-    0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-    0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-    0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-    0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-    0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-    0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-    0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-    0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-    0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-    0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-    0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-    0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-    0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-    0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-    0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-    0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-    0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-    0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-    0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-    0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-    0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-    0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-    0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-    0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-    0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-    0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-    0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-    0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-    0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-    0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-    0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-    0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-    0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-    0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-    0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-    0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-    0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-    0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-    0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-    0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-    0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-    0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-    0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-    0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-    0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-    0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-    0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-    0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-    0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
+       0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
+       0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
+       0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
+       0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
+       0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
+       0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
+       0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
+       0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
+       0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
+       0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
+       0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
+       0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
+       0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
+       0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
+       0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
+       0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
+       0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
+       0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
+       0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
+       0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
+       0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
+       0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
+       0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
+       0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
+       0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
+       0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
+       0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
+       0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
+       0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
+       0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
+       0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
+       0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
+       0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
+       0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
+       0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
+       0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
+       0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
+       0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
+       0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
+       0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
+       0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
+       0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
+       0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
+       0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
+       0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
+       0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
+       0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
+       0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
+       0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
+       0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
+       0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
+       0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
+       0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
+       0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
+       0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
+       0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
+       0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
+       0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
+       0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
+       0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
+       0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
+       0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
+       0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
+       0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
 };
 static const u32 Td2[256] = {
-    0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-    0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-    0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-    0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-    0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-    0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-    0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-    0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-    0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-    0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-    0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-    0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-    0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-    0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-    0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-    0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-    0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-    0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-    0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-    0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-    0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-    0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-    0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-    0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-    0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-    0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-    0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-    0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-    0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-    0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-    0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-    0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-    0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-    0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-    0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-    0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-    0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-    0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-    0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-    0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-    0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-    0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-    0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-    0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-    0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-    0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-    0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-    0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-    0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-    0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-    0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-    0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-    0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-    0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-    0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-    0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-    0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-    0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-    0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-    0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-    0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-    0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-    0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-    0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
+       0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
+       0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
+       0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
+       0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
+       0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
+       0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
+       0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
+       0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
+       0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
+       0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
+       0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
+       0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
+       0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
+       0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
+       0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
+       0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
+       0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
+       0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
+       0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
+       0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
+       0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
+       0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
+       0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
+       0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
+       0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
+       0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
+       0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
+       0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
+       0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
+       0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
+       0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
+       0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
+       0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
+       0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
+       0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
+       0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
+       0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
+       0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
+       0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
+       0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
+       0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
+       0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
+       0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
+       0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
+       0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
+       0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
+       0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
+       0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
+       0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
+       0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
+       0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
+       0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
+       0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
+       0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
+       0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
+       0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
+       0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
+       0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
+       0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
+       0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
+       0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
+       0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
+       0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
+       0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
 };
 static const u32 Td3[256] = {
-    0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-    0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-    0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-    0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-    0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-    0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-    0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-    0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-    0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-    0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-    0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-    0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-    0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-    0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-    0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-    0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-    0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-    0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-    0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-    0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-    0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-    0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-    0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-    0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-    0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-    0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-    0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-    0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-    0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-    0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-    0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-    0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-    0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-    0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-    0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-    0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-    0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-    0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-    0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-    0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-    0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-    0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-    0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-    0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-    0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-    0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-    0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-    0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-    0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-    0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-    0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-    0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-    0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-    0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-    0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-    0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-    0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-    0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-    0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-    0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-    0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-    0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-    0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-    0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
+       0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
+       0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
+       0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
+       0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
+       0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
+       0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
+       0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
+       0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
+       0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
+       0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
+       0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
+       0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
+       0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
+       0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
+       0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
+       0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
+       0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
+       0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
+       0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
+       0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
+       0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
+       0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
+       0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
+       0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
+       0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
+       0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
+       0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
+       0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
+       0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
+       0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
+       0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
+       0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
+       0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
+       0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
+       0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
+       0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
+       0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
+       0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
+       0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
+       0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
+       0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
+       0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
+       0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
+       0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
+       0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
+       0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
+       0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
+       0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
+       0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
+       0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
+       0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
+       0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
+       0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
+       0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
+       0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
+       0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
+       0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
+       0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
+       0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
+       0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
+       0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
+       0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
+       0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
+       0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
 };
 static const u8 Td4[256] = {
-    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
-    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
-    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
-    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
-    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
-    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
-    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
-    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
-    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
-    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
-    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
-    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
-    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
-    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
-    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
-    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
-    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
-    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
-    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
-    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
-    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
-    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
-    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
-    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
-    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
-    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
-    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
-    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
-    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
-    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
-    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
-    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
+       0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
+       0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
+       0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
+       0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
+       0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
+       0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
+       0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
+       0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
+       0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
+       0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
+       0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
+       0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
+       0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
+       0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
+       0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
+       0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
+       0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
+       0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
+       0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
+       0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
+       0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
+       0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
+       0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
+       0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
+       0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
+       0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
+       0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
+       0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
+       0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
+       0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
+       0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
+       0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU,
 };
 static const u32 rcon[] = {
        0x01000000, 0x02000000, 0x04000000, 0x08000000,
@@ -625,11 +625,12 @@ static const u32 rcon[] = {
 /**
  * Expand the cipher key into the encryption key schedule.
  */
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key) {
-
+int
+private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
        u32 *rk;
-       int i = 0;
+       int i = 0;
        u32 temp;
 
        if (!userKey || !key)
@@ -639,26 +640,26 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 
        rk = key->rd_key;
 
-       if (bits==128)
+       if (bits == 128)
                key->rounds = 10;
-       else if (bits==192)
+       else if (bits == 192)
                key->rounds = 12;
        else
                key->rounds = 14;
 
-       rk[0] = GETU32(userKey     );
-       rk[1] = GETU32(userKey +  4);
-       rk[2] = GETU32(userKey +  8);
+       rk[0] = GETU32(userKey);
+       rk[1] = GETU32(userKey + 4);
+       rk[2] = GETU32(userKey + 8);
        rk[3] = GETU32(userKey + 12);
        if (bits == 128) {
                while (1) {
-                       temp  = rk[3];
+                       temp = rk[3];
                        rk[4] = rk[0] ^
-                               (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                               (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                               (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                               (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                               rcon[i];
+                           (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+                           (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
+                           (Te0[(temp) & 0xff] & 0x0000ff00) ^
+                           (Te1[(temp >> 24)] & 0x000000ff) ^
+                           rcon[i];
                        rk[5] = rk[1] ^ rk[4];
                        rk[6] = rk[2] ^ rk[5];
                        rk[7] = rk[3] ^ rk[6];
@@ -672,21 +673,21 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[5] = GETU32(userKey + 20);
        if (bits == 192) {
                while (1) {
-                       temp = rk[ 5];
-                       rk[ 6] = rk[ 0] ^
-                               (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                               (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                               (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                               (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                               rcon[i];
-                       rk[ 7] = rk[ 1] ^ rk[ 6];
-                       rk[ 8] = rk[ 2] ^ rk[ 7];
-                       rk[ 9] = rk[ 3] ^ rk[ 8];
+                       temp = rk[5];
+                       rk[6] = rk[ 0] ^
+                           (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+                           (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
+                           (Te0[(temp) & 0xff] & 0x0000ff00) ^
+                           (Te1[(temp >> 24)] & 0x000000ff) ^
+                           rcon[i];
+                       rk[7] = rk[1] ^ rk[6];
+                       rk[8] = rk[2] ^ rk[7];
+                       rk[9] = rk[3] ^ rk[8];
                        if (++i == 8) {
                                return 0;
                        }
-                       rk[10] = rk[ 4] ^ rk[ 9];
-                       rk[11] = rk[ 5] ^ rk[10];
+                       rk[10] = rk[4] ^ rk[9];
+                       rk[11] = rk[5] ^ rk[10];
                        rk += 6;
                }
        }
@@ -694,31 +695,31 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[7] = GETU32(userKey + 28);
        if (bits == 256) {
                while (1) {
-                       temp = rk[ 7];
-                       rk[ 8] = rk[ 0] ^
-                               (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
-                               (Te3[(temp >>  8) & 0xff] & 0x00ff0000) ^
-                               (Te0[(temp      ) & 0xff] & 0x0000ff00) ^
-                               (Te1[(temp >> 24)       ] & 0x000000ff) ^
-                               rcon[i];
-                       rk[ 9] = rk[ 1] ^ rk[ 8];
-                       rk[10] = rk[ 2] ^ rk[ 9];
-                       rk[11] = rk[ 3] ^ rk[10];
+                       temp = rk[7];
+                       rk[8] = rk[0] ^
+                           (Te2[(temp >> 16) & 0xff] & 0xff000000) ^
+                           (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^
+                           (Te0[(temp) & 0xff] & 0x0000ff00) ^
+                           (Te1[(temp >> 24)] & 0x000000ff) ^
+                           rcon[i];
+                       rk[9] = rk[1] ^ rk[8];
+                       rk[10] = rk[2] ^ rk[9];
+                       rk[11] = rk[3] ^ rk[10];
                        if (++i == 7) {
                                return 0;
                        }
                        temp = rk[11];
-                       rk[12] = rk[ 4] ^
-                               (Te2[(temp >> 24)       ] & 0xff000000) ^
-                               (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
-                               (Te0[(temp >>  8) & 0xff] & 0x0000ff00) ^
-                               (Te1[(temp      ) & 0xff] & 0x000000ff);
-                       rk[13] = rk[ 5] ^ rk[12];
-                       rk[14] = rk[ 6] ^ rk[13];
-                       rk[15] = rk[ 7] ^ rk[14];
+                       rk[12] = rk[4] ^
+                           (Te2[(temp >> 24)] & 0xff000000) ^
+                           (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^
+                           (Te0[(temp >> 8) & 0xff] & 0x0000ff00) ^
+                           (Te1[(temp) & 0xff] & 0x000000ff);
+                       rk[13] = rk[5] ^ rk[12];
+                       rk[14] = rk[6] ^ rk[13];
+                       rk[15] = rk[7] ^ rk[14];
 
                        rk += 8;
-               }
+               }
        }
        return 0;
 }
@@ -726,10 +727,11 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 /**
  * Expand the cipher key into the decryption key schedule.
  */
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key) {
-
-        u32 *rk;
+int
+private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
+       u32 *rk;
        int i, j, status;
        u32 temp;
 
@@ -741,35 +743,43 @@ int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
        rk = key->rd_key;
 
        /* invert the order of the round keys: */
-       for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-               temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-               temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-               temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-               temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+       for (i = 0, j = 4 * (key->rounds); i < j; i += 4, j -= 4) {
+               temp = rk[i];
+               rk[i] = rk[j];
+               rk[j] = temp;
+               temp = rk[i + 1];
+               rk[i + 1] = rk[j + 1];
+               rk[j + 1] = temp;
+               temp = rk[i + 2];
+               rk[i + 2] = rk[j + 2];
+               rk[j + 2] = temp;
+               temp = rk[i + 3];
+               rk[i + 3] = rk[j + 3];
+               rk[j + 3] = temp;
        }
        /* apply the inverse MixColumn transform to all round keys but the first and the last: */
        for (i = 1; i < (key->rounds); i++) {
                rk += 4;
                rk[0] =
-                       Td0[Te1[(rk[0] >> 24)       ] & 0xff] ^
-                       Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
-                       Td2[Te1[(rk[0] >>  8) & 0xff] & 0xff] ^
-                       Td3[Te1[(rk[0]      ) & 0xff] & 0xff];
+                   Td0[Te1[(rk[0] >> 24)] & 0xff] ^
+                   Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^
+                   Td2[Te1[(rk[0] >> 8) & 0xff] & 0xff] ^
+                   Td3[Te1[(rk[0]) & 0xff] & 0xff];
                rk[1] =
-                       Td0[Te1[(rk[1] >> 24)       ] & 0xff] ^
-                       Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
-                       Td2[Te1[(rk[1] >>  8) & 0xff] & 0xff] ^
-                       Td3[Te1[(rk[1]      ) & 0xff] & 0xff];
+                   Td0[Te1[(rk[1] >> 24)] & 0xff] ^
+                   Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^
+                   Td2[Te1[(rk[1] >> 8) & 0xff] & 0xff] ^
+                   Td3[Te1[(rk[1]) & 0xff] & 0xff];
                rk[2] =
-                       Td0[Te1[(rk[2] >> 24)       ] & 0xff] ^
-                       Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
-                       Td2[Te1[(rk[2] >>  8) & 0xff] & 0xff] ^
-                       Td3[Te1[(rk[2]      ) & 0xff] & 0xff];
+                   Td0[Te1[(rk[2] >> 24)] & 0xff] ^
+                   Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^
+                   Td2[Te1[(rk[2] >> 8) & 0xff] & 0xff] ^
+                   Td3[Te1[(rk[2]) & 0xff] & 0xff];
                rk[3] =
-                       Td0[Te1[(rk[3] >> 24)       ] & 0xff] ^
-                       Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
-                       Td2[Te1[(rk[3] >>  8) & 0xff] & 0xff] ^
-                       Td3[Te1[(rk[3]      ) & 0xff] & 0xff];
+                   Td0[Te1[(rk[3] >> 24)] & 0xff] ^
+                   Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^
+                   Td2[Te1[(rk[3] >> 8) & 0xff] & 0xff] ^
+                   Td3[Te1[(rk[3]) & 0xff] & 0xff];
        }
        return 0;
 }
@@ -778,9 +788,9 @@ int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
  * Encrypt a single block
  * in and out can overlap
  */
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-                const AES_KEY *key) {
-
+void
+AES_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
+{
        const u32 *rk;
        u32 s0, s1, s2, s3, t0, t1, t2, t3;
 #ifndef FULL_UNROLL
@@ -800,168 +810,168 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
        s3 = GETU32(in + 12) ^ rk[3];
 #ifdef FULL_UNROLL
        /* round 1: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
-       /* round 2: */
-       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
-       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
-       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
-       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[ 4];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[ 5];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[ 6];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[ 7];
+       /* round 2: */
+       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[ 8];
+       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[ 9];
+       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[10];
+       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[11];
        /* round 3: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
-       /* round 4: */
-       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
-       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
-       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
-       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[12];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[13];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[14];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[15];
+       /* round 4: */
+       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[16];
+       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[17];
+       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[18];
+       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[19];
        /* round 5: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
-       /* round 6: */
-       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
-       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
-       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
-       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[20];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[21];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[22];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[23];
+       /* round 6: */
+       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[24];
+       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[25];
+       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[26];
+       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[27];
        /* round 7: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
-       /* round 8: */
-       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
-       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
-       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
-       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[28];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[29];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[30];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[31];
+       /* round 8: */
+       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[32];
+       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[33];
+       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[34];
+       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[35];
        /* round 9: */
-       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
-       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
-       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
-       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
-        s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
-        s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
-        s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
-        t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
-        t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
-        t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
-            s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
-            s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
-            s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
-            t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
-            t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
-            t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
-        }
-    }
-    rk += key->rounds << 2;
+       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[36];
+       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[37];
+       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[38];
+       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[39];
+       if (key->rounds > 10) {
+               /* round 10: */
+               s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[40];
+               s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[41];
+               s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[42];
+               s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[43];
+               /* round 11: */
+               t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[44];
+               t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[45];
+               t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[46];
+               t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[47];
+               if (key->rounds > 12) {
+                       /* round 12: */
+                       s0 = Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff] ^ Te3[t3 & 0xff] ^ rk[48];
+                       s1 = Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff] ^ Te3[t0 & 0xff] ^ rk[49];
+                       s2 = Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff] ^ Te3[t1 & 0xff] ^ rk[50];
+                       s3 = Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff] ^ Te3[t2 & 0xff] ^ rk[51];
+                       /* round 13: */
+                       t0 = Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff] ^ Te3[s3 & 0xff] ^ rk[52];
+                       t1 = Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff] ^ Te3[s0 & 0xff] ^ rk[53];
+                       t2 = Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff] ^ Te3[s1 & 0xff] ^ rk[54];
+                       t3 = Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff] ^ Te3[s2 & 0xff] ^ rk[55];
+               }
+       }
+       rk += key->rounds << 2;
 #else  /* !FULL_UNROLL */
     /*
      * Nr - 1 full rounds:
      */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Te0[(s0 >> 24)       ] ^
-            Te1[(s1 >> 16) & 0xff] ^
-            Te2[(s2 >>  8) & 0xff] ^
-            Te3[(s3      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Te0[(s1 >> 24)       ] ^
-            Te1[(s2 >> 16) & 0xff] ^
-            Te2[(s3 >>  8) & 0xff] ^
-            Te3[(s0      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Te0[(s2 >> 24)       ] ^
-            Te1[(s3 >> 16) & 0xff] ^
-            Te2[(s0 >>  8) & 0xff] ^
-            Te3[(s1      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Te0[(s3 >> 24)       ] ^
-            Te1[(s0 >> 16) & 0xff] ^
-            Te2[(s1 >>  8) & 0xff] ^
-            Te3[(s2      ) & 0xff] ^
-            rk[7];
+       r = key->rounds >> 1;
+       for (;;) {
+               t0 =
+                   Te0[(s0 >> 24)] ^
+                   Te1[(s1 >> 16) & 0xff] ^
+                   Te2[(s2 >> 8) & 0xff] ^
+                   Te3[(s3) & 0xff] ^
+                   rk[4];
+               t1 =
+                   Te0[(s1 >> 24)] ^
+                   Te1[(s2 >> 16) & 0xff] ^
+                   Te2[(s3 >> 8) & 0xff] ^
+                   Te3[(s0) & 0xff] ^
+                   rk[5];
+               t2 =
+                   Te0[(s2 >> 24)] ^
+                   Te1[(s3 >> 16) & 0xff] ^
+                   Te2[(s0 >> 8) & 0xff] ^
+                   Te3[(s1) & 0xff] ^
+                   rk[6];
+               t3 =
+                   Te0[(s3 >> 24)] ^
+                   Te1[(s0 >> 16) & 0xff] ^
+                   Te2[(s1 >> 8) & 0xff] ^
+                   Te3[(s2) & 0xff] ^
+                   rk[7];
 
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
+               rk += 8;
+               if (--r == 0) {
+                       break;
+               }
 
-        s0 =
-            Te0[(t0 >> 24)       ] ^
-            Te1[(t1 >> 16) & 0xff] ^
-            Te2[(t2 >>  8) & 0xff] ^
-            Te3[(t3      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Te0[(t1 >> 24)       ] ^
-            Te1[(t2 >> 16) & 0xff] ^
-            Te2[(t3 >>  8) & 0xff] ^
-            Te3[(t0      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Te0[(t2 >> 24)       ] ^
-            Te1[(t3 >> 16) & 0xff] ^
-            Te2[(t0 >>  8) & 0xff] ^
-            Te3[(t1      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Te0[(t3 >> 24)       ] ^
-            Te1[(t0 >> 16) & 0xff] ^
-            Te2[(t1 >>  8) & 0xff] ^
-            Te3[(t2      ) & 0xff] ^
-            rk[3];
-    }
+               s0 =
+                   Te0[(t0 >> 24)] ^
+                   Te1[(t1 >> 16) & 0xff] ^
+                   Te2[(t2 >> 8) & 0xff] ^
+                   Te3[(t3) & 0xff] ^
+                   rk[0];
+               s1 =
+                   Te0[(t1 >> 24)] ^
+                   Te1[(t2 >> 16) & 0xff] ^
+                   Te2[(t3 >> 8) & 0xff] ^
+                   Te3[(t0) & 0xff] ^
+                   rk[1];
+               s2 =
+                   Te0[(t2 >> 24)] ^
+                   Te1[(t3 >> 16) & 0xff] ^
+                   Te2[(t0 >> 8) & 0xff] ^
+                   Te3[(t1) & 0xff] ^
+                   rk[2];
+               s3 =
+                   Te0[(t3 >> 24)] ^
+                   Te1[(t0 >> 16) & 0xff] ^
+                   Te2[(t1 >> 8) & 0xff] ^
+                   Te3[(t2) & 0xff] ^
+                   rk[3];
+       }
 #endif /* ?FULL_UNROLL */
-    /*
+       /*
         * apply last round and
         * map cipher state to byte array block:
         */
        s0 =
-               (Te2[(t0 >> 24)       ] & 0xff000000) ^
-               (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-               (Te0[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-               (Te1[(t3      ) & 0xff] & 0x000000ff) ^
-               rk[0];
-       PUTU32(out     , s0);
+           (Te2[(t0 >> 24)] & 0xff000000) ^
+           (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^
+           (Te0[(t2 >> 8) & 0xff] & 0x0000ff00) ^
+           (Te1[(t3) & 0xff] & 0x000000ff) ^
+           rk[0];
+       PUTU32(out, s0);
        s1 =
-               (Te2[(t1 >> 24)       ] & 0xff000000) ^
-               (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-               (Te0[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-               (Te1[(t0      ) & 0xff] & 0x000000ff) ^
-               rk[1];
+           (Te2[(t1 >> 24)] & 0xff000000) ^
+           (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^
+           (Te0[(t3 >> 8) & 0xff] & 0x0000ff00) ^
+           (Te1[(t0) & 0xff] & 0x000000ff) ^
+           rk[1];
        PUTU32(out +  4, s1);
        s2 =
-               (Te2[(t2 >> 24)       ] & 0xff000000) ^
-               (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-               (Te0[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-               (Te1[(t1      ) & 0xff] & 0x000000ff) ^
-               rk[2];
+           (Te2[(t2 >> 24)] & 0xff000000) ^
+           (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^
+           (Te0[(t0 >> 8) & 0xff] & 0x0000ff00) ^
+           (Te1[(t1) & 0xff] & 0x000000ff) ^
+           rk[2];
        PUTU32(out +  8, s2);
        s3 =
-               (Te2[(t3 >> 24)       ] & 0xff000000) ^
-               (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-               (Te0[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-               (Te1[(t2      ) & 0xff] & 0x000000ff) ^
-               rk[3];
+           (Te2[(t3 >> 24)] & 0xff000000) ^
+           (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^
+           (Te0[(t1 >> 8) & 0xff] & 0x0000ff00) ^
+           (Te1[(t2) & 0xff] & 0x000000ff) ^
+           rk[3];
        PUTU32(out + 12, s3);
 }
 
@@ -969,9 +979,9 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
  * Decrypt a single block
  * in and out can overlap
  */
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-                const AES_KEY *key) {
-
+void
+AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
+{
        const u32 *rk;
        u32 s0, s1, s2, s3, t0, t1, t2, t3;
 #ifndef FULL_UNROLL
@@ -985,226 +995,229 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
         * map byte array block to cipher state
         * and add initial round key:
         */
-    s0 = GETU32(in     ) ^ rk[0];
-    s1 = GETU32(in +  4) ^ rk[1];
-    s2 = GETU32(in +  8) ^ rk[2];
-    s3 = GETU32(in + 12) ^ rk[3];
+       s0 = GETU32(in) ^ rk[0];
+       s1 = GETU32(in + 4) ^ rk[1];
+       s2 = GETU32(in + 8) ^ rk[2];
+       s3 = GETU32(in + 12) ^ rk[3];
 #ifdef FULL_UNROLL
-    /* round 1: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
-    /* round 2: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
-    /* round 3: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
-    /* round 4: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
-    /* round 5: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
-    /* round 6: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
-    /* round 7: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
-    /* round 8: */
-    s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
-    s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
-    s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
-    s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
-    /* round 9: */
-    t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
-    t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
-    t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
-    t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
-    if (key->rounds > 10) {
-        /* round 10: */
-        s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
-        s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
-        s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
-        s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
-        /* round 11: */
-        t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
-        t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
-        t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
-        t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
-        if (key->rounds > 12) {
-            /* round 12: */
-            s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
-            s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
-            s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
-            s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
-            /* round 13: */
-            t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
-            t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
-            t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
-            t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
-        }
-    }
+       /* round 1: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[ 4];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[ 5];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[ 6];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[ 7];
+       /* round 2: */
+       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[ 8];
+       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[ 9];
+       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[10];
+       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[11];
+       /* round 3: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[12];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[13];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[14];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[15];
+       /* round 4: */
+       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[16];
+       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[17];
+       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[18];
+       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[19];
+       /* round 5: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[20];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[21];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[22];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[23];
+       /* round 6: */
+       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[24];
+       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[25];
+       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[26];
+       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[27];
+       /* round 7: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[28];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[29];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[30];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[31];
+       /* round 8: */
+       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[32];
+       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[33];
+       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[34];
+       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[35];
+       /* round 9: */
+       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[36];
+       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[37];
+       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[38];
+       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[39];
+       if (key->rounds > 10) {
+               /* round 10: */
+               s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[40];
+               s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[41];
+               s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[42];
+               s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[43];
+               /* round 11: */
+               t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[44];
+               t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[45];
+               t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[46];
+               t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[47];
+               if (key->rounds > 12) {
+                       /* round 12: */
+                       s0 = Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff] ^ Td3[t1 & 0xff] ^ rk[48];
+                       s1 = Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff] ^ Td3[t2 & 0xff] ^ rk[49];
+                       s2 = Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff] ^ Td3[t3 & 0xff] ^ rk[50];
+                       s3 = Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff] ^ Td3[t0 & 0xff] ^ rk[51];
+                       /* round 13: */
+                       t0 = Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff] ^ Td3[s1 & 0xff] ^ rk[52];
+                       t1 = Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff] ^ Td3[s2 & 0xff] ^ rk[53];
+                       t2 = Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff] ^ Td3[s3 & 0xff] ^ rk[54];
+                       t3 = Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff] ^ Td3[s0 & 0xff] ^ rk[55];
+               }
+       }
        rk += key->rounds << 2;
 #else  /* !FULL_UNROLL */
     /*
      * Nr - 1 full rounds:
      */
-    r = key->rounds >> 1;
-    for (;;) {
-        t0 =
-            Td0[(s0 >> 24)       ] ^
-            Td1[(s3 >> 16) & 0xff] ^
-            Td2[(s2 >>  8) & 0xff] ^
-            Td3[(s1      ) & 0xff] ^
-            rk[4];
-        t1 =
-            Td0[(s1 >> 24)       ] ^
-            Td1[(s0 >> 16) & 0xff] ^
-            Td2[(s3 >>  8) & 0xff] ^
-            Td3[(s2      ) & 0xff] ^
-            rk[5];
-        t2 =
-            Td0[(s2 >> 24)       ] ^
-            Td1[(s1 >> 16) & 0xff] ^
-            Td2[(s0 >>  8) & 0xff] ^
-            Td3[(s3      ) & 0xff] ^
-            rk[6];
-        t3 =
-            Td0[(s3 >> 24)       ] ^
-            Td1[(s2 >> 16) & 0xff] ^
-            Td2[(s1 >>  8) & 0xff] ^
-            Td3[(s0      ) & 0xff] ^
-            rk[7];
+       r = key->rounds >> 1;
+       for (;;) {
+               t0 =
+                   Td0[(s0 >> 24)] ^
+                   Td1[(s3 >> 16) & 0xff] ^
+                   Td2[(s2 >> 8) & 0xff] ^
+                   Td3[(s1) & 0xff] ^
+                   rk[4];
+               t1 =
+                   Td0[(s1 >> 24)] ^
+                   Td1[(s0 >> 16) & 0xff] ^
+                   Td2[(s3 >> 8) & 0xff] ^
+                   Td3[(s2) & 0xff] ^
+                   rk[5];
+               t2 =
+                   Td0[(s2 >> 24)] ^
+                   Td1[(s1 >> 16) & 0xff] ^
+                   Td2[(s0 >> 8) & 0xff] ^
+                   Td3[(s3) & 0xff] ^
+                   rk[6];
+               t3 =
+                   Td0[(s3 >> 24)] ^
+                   Td1[(s2 >> 16) & 0xff] ^
+                   Td2[(s1 >> 8) & 0xff] ^
+                   Td3[(s0) & 0xff] ^
+                   rk[7];
 
-        rk += 8;
-        if (--r == 0) {
-            break;
-        }
+               rk += 8;
+               if (--r == 0) {
+                       break;
+               }
 
-        s0 =
-            Td0[(t0 >> 24)       ] ^
-            Td1[(t3 >> 16) & 0xff] ^
-            Td2[(t2 >>  8) & 0xff] ^
-            Td3[(t1      ) & 0xff] ^
-            rk[0];
-        s1 =
-            Td0[(t1 >> 24)       ] ^
-            Td1[(t0 >> 16) & 0xff] ^
-            Td2[(t3 >>  8) & 0xff] ^
-            Td3[(t2      ) & 0xff] ^
-            rk[1];
-        s2 =
-            Td0[(t2 >> 24)       ] ^
-            Td1[(t1 >> 16) & 0xff] ^
-            Td2[(t0 >>  8) & 0xff] ^
-            Td3[(t3      ) & 0xff] ^
-            rk[2];
-        s3 =
-            Td0[(t3 >> 24)       ] ^
-            Td1[(t2 >> 16) & 0xff] ^
-            Td2[(t1 >>  8) & 0xff] ^
-            Td3[(t0      ) & 0xff] ^
-            rk[3];
-    }
+               s0 =
+                   Td0[(t0 >> 24)] ^
+                   Td1[(t3 >> 16) & 0xff] ^
+                   Td2[(t2 >> 8) & 0xff] ^
+                   Td3[(t1) & 0xff] ^
+                   rk[0];
+               s1 =
+                   Td0[(t1 >> 24)] ^
+                   Td1[(t0 >> 16) & 0xff] ^
+                   Td2[(t3 >> 8) & 0xff] ^
+                   Td3[(t2) & 0xff] ^
+                   rk[1];
+               s2 =
+                   Td0[(t2 >> 24)] ^
+                   Td1[(t1 >> 16) & 0xff] ^
+                   Td2[(t0 >> 8) & 0xff] ^
+                   Td3[(t3) & 0xff] ^
+                   rk[2];
+               s3 =
+                   Td0[(t3 >> 24)] ^
+                   Td1[(t2 >> 16) & 0xff] ^
+                   Td2[(t1 >> 8) & 0xff] ^
+                   Td3[(t0) & 0xff] ^
+                   rk[3];
+       }
 #endif /* ?FULL_UNROLL */
     /*
         * apply last round and
         * map cipher state to byte array block:
         */
-       s0 =
-               (Td4[(t0 >> 24)       ] << 24) ^
-               (Td4[(t3 >> 16) & 0xff] << 16) ^
-               (Td4[(t2 >>  8) & 0xff] <<  8) ^
-               (Td4[(t1      ) & 0xff])       ^
-               rk[0];
-       PUTU32(out     , s0);
-       s1 =
-               (Td4[(t1 >> 24)       ] << 24) ^
-               (Td4[(t0 >> 16) & 0xff] << 16) ^
-               (Td4[(t3 >>  8) & 0xff] <<  8) ^
-               (Td4[(t2      ) & 0xff])       ^
-               rk[1];
-       PUTU32(out +  4, s1);
-       s2 =
-               (Td4[(t2 >> 24)       ] << 24) ^
-               (Td4[(t1 >> 16) & 0xff] << 16) ^
-               (Td4[(t0 >>  8) & 0xff] <<  8) ^
-               (Td4[(t3      ) & 0xff])       ^
-               rk[2];
-       PUTU32(out +  8, s2);
-       s3 =
-               (Td4[(t3 >> 24)       ] << 24) ^
-               (Td4[(t2 >> 16) & 0xff] << 16) ^
-               (Td4[(t1 >>  8) & 0xff] <<  8) ^
-               (Td4[(t0      ) & 0xff])       ^
-               rk[3];
+       s0 =
+           (Td4[(t0 >> 24)] << 24) ^
+           (Td4[(t3 >> 16) & 0xff] << 16) ^
+           (Td4[(t2 >> 8) & 0xff] <<  8) ^
+           (Td4[(t1) & 0xff]) ^
+           rk[0];
+       PUTU32(out, s0);
+       s1 =
+           (Td4[(t1 >> 24)] << 24) ^
+           (Td4[(t0 >> 16) & 0xff] << 16) ^
+           (Td4[(t3 >> 8) & 0xff] <<  8) ^
+           (Td4[(t2) & 0xff]) ^
+           rk[1];
+       PUTU32(out + 4, s1);
+       s2 =
+           (Td4[(t2 >> 24)] << 24) ^
+           (Td4[(t1 >> 16) & 0xff] << 16) ^
+           (Td4[(t0 >> 8) & 0xff] <<  8) ^
+           (Td4[(t3) & 0xff]) ^
+           rk[2];
+       PUTU32(out + 8, s2);
+       s3 =
+           (Td4[(t3 >> 24)] << 24) ^
+           (Td4[(t2 >> 16) & 0xff] << 16) ^
+           (Td4[(t1 >> 8) & 0xff] <<  8) ^
+           (Td4[(t0) & 0xff]) ^
+           rk[3];
        PUTU32(out + 12, s3);
 }
 
 #else /* AES_ASM */
 
 static const u8 Te4[256] = {
-    0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
-    0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
-    0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
-    0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
-    0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
-    0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
-    0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
-    0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
-    0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
-    0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
-    0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
-    0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
-    0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
-    0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
-    0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
-    0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
-    0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
-    0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
-    0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
-    0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
-    0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
-    0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
-    0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
-    0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
-    0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
-    0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
-    0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
-    0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
-    0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
-    0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
-    0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
-    0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
+       0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
+       0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
+       0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
+       0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
+       0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
+       0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
+       0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
+       0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
+       0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
+       0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
+       0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
+       0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
+       0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
+       0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
+       0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
+       0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
+       0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
+       0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
+       0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
+       0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
+       0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
+       0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
+       0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
+       0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
+       0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
+       0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
+       0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
+       0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
+       0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
+       0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
+       0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
+       0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
 };
 static const u32 rcon[] = {
        0x01000000, 0x02000000, 0x04000000, 0x08000000,
        0x10000000, 0x20000000, 0x40000000, 0x80000000,
-       0x1B000000, 0x36000000, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+       0x1B000000, 0x36000000,
+       /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
 };
 
 /**
  * Expand the cipher key into the encryption key schedule.
  */
-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key) {
+int
+private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
        u32 *rk;
-       int i = 0;
+       int i = 0;
        u32 temp;
 
        if (!userKey || !key)
@@ -1214,26 +1227,26 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 
        rk = key->rd_key;
 
-       if (bits==128)
+       if (bits == 128)
                key->rounds = 10;
-       else if (bits==192)
+       else if (bits == 192)
                key->rounds = 12;
        else
                key->rounds = 14;
 
-       rk[0] = GETU32(userKey     );
+       rk[0] = GETU32(userKey);
        rk[1] = GETU32(userKey +  4);
        rk[2] = GETU32(userKey +  8);
        rk[3] = GETU32(userKey + 12);
        if (bits == 128) {
                while (1) {
-                       temp  = rk[3];
+                       temp = rk[3];
                        rk[4] = rk[0] ^
-                               (Te4[(temp >> 16) & 0xff] << 24) ^
-                               (Te4[(temp >>  8) & 0xff] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 8) ^
-                               (Te4[(temp >> 24)       ]) ^
-                               rcon[i];
+                           (Te4[(temp >> 16) & 0xff] << 24) ^
+                           (Te4[(temp >> 8) & 0xff] << 16) ^
+                           (Te4[(temp) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)]) ^
+                           rcon[i];
                        rk[5] = rk[1] ^ rk[4];
                        rk[6] = rk[2] ^ rk[5];
                        rk[7] = rk[3] ^ rk[6];
@@ -1247,21 +1260,21 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[5] = GETU32(userKey + 20);
        if (bits == 192) {
                while (1) {
-                       temp = rk[ 5];
-                       rk[ 6] = rk[ 0] ^
-                               (Te4[(temp >> 16) & 0xff] << 24) ^
-                               (Te4[(temp >>  8) & 0xff] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 8) ^
-                               (Te4[(temp >> 24)       ]) ^
-                               rcon[i];
-                       rk[ 7] = rk[ 1] ^ rk[ 6];
-                       rk[ 8] = rk[ 2] ^ rk[ 7];
-                       rk[ 9] = rk[ 3] ^ rk[ 8];
+                       temp = rk[5];
+                       rk[6] = rk[0] ^
+                           (Te4[(temp >> 16) & 0xff] << 24) ^
+                           (Te4[(temp >> 8) & 0xff] << 16) ^
+                           (Te4[(temp) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)]) ^
+                           rcon[i];
+                       rk[7] = rk[1] ^ rk[6];
+                       rk[8] = rk[2] ^ rk[7];
+                       rk[9] = rk[3] ^ rk[8];
                        if (++i == 8) {
                                return 0;
                        }
-                       rk[10] = rk[ 4] ^ rk[ 9];
-                       rk[11] = rk[ 5] ^ rk[10];
+                       rk[10] = rk[4] ^ rk[9];
+                       rk[11] = rk[5] ^ rk[10];
                        rk += 6;
                }
        }
@@ -1269,31 +1282,31 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[7] = GETU32(userKey + 28);
        if (bits == 256) {
                while (1) {
-                       temp = rk[ 7];
-                       rk[ 8] = rk[ 0] ^
-                               (Te4[(temp >> 16) & 0xff] << 24) ^
-                               (Te4[(temp >>  8) & 0xff] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 8) ^
-                               (Te4[(temp >> 24)       ]) ^
-                               rcon[i];
-                       rk[ 9] = rk[ 1] ^ rk[ 8];
-                       rk[10] = rk[ 2] ^ rk[ 9];
-                       rk[11] = rk[ 3] ^ rk[10];
+                       temp = rk[7];
+                       rk[8] = rk[0] ^
+                           (Te4[(temp >> 16) & 0xff] << 24) ^
+                           (Te4[(temp >> 8) & 0xff] << 16) ^
+                           (Te4[(temp) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)]) ^
+                           rcon[i];
+                       rk[9] = rk[1] ^ rk[8];
+                       rk[10] = rk[2] ^ rk[9];
+                       rk[11] = rk[3] ^ rk[10];
                        if (++i == 7) {
                                return 0;
                        }
                        temp = rk[11];
-                       rk[12] = rk[ 4] ^
-                               (Te4[(temp >> 24)       ] << 24) ^
-                               (Te4[(temp >> 16) & 0xff] << 16) ^
-                               (Te4[(temp >>  8) & 0xff] << 8) ^
-                               (Te4[(temp      ) & 0xff]);
-                       rk[13] = rk[ 5] ^ rk[12];
-                       rk[14] = rk[ 6] ^ rk[13];
-                       rk[15] = rk[ 7] ^ rk[14];
+                       rk[12] = rk[4] ^
+                           (Te4[(temp >> 24)] << 24) ^
+                           (Te4[(temp >> 16) & 0xff] << 16) ^
+                           (Te4[(temp >> 8) & 0xff] << 8) ^
+                           (Te4[(temp) & 0xff]);
+                       rk[13] = rk[5] ^ rk[12];
+                       rk[14] = rk[6] ^ rk[13];
+                       rk[15] = rk[7] ^ rk[14];
 
                        rk += 8;
-               }
+               }
        }
        return 0;
 }
@@ -1301,10 +1314,11 @@ int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 /**
  * Expand the cipher key into the decryption key schedule.
  */
-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key) {
-
-        u32 *rk;
+int
+private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
+       u32 *rk;
        int i, j, status;
        u32 temp;
 
@@ -1317,10 +1331,18 @@ int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
 
        /* invert the order of the round keys: */
        for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-               temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-               temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-               temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-               temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+               temp = rk[i];
+               rk[i] = rk[j];
+               rk[j] = temp;
+               temp = rk[i + 1];
+               rk[i + 1] = rk[j + 1];
+               rk[j + 1] = temp;
+               temp = rk[i + 2];
+               rk[i + 2] = rk[j + 2];
+               rk[j + 2] = temp;
+               temp = rk[i + 3];
+               rk[i + 3] = rk[j + 3];
+               rk[j + 3] = temp;
        }
        /* apply the inverse MixColumn transform to all round keys but the first and the last: */
        for (i = 1; i < (key->rounds); i++) {
@@ -1331,24 +1353,24 @@ int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,
                        tp1 = rk[j];
                        m = tp1 & 0x80808080;
                        tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp2 & 0x80808080;
                        tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp4 & 0x80808080;
                        tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        tp9 = tp8 ^ tp1;
                        tpb = tp9 ^ tp2;
                        tpd = tp9 ^ tp4;
                        tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-                       rk[j] = tpe ^ ROTATE(tpd,16) ^
-                               ROTATE(tp9,24) ^ ROTATE(tpb,8);
+                       rk[j] = tpe ^ ROTATE(tpd, 16) ^
+                           ROTATE(tp9, 24) ^ ROTATE(tpb, 8);
 #else
-                       rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-                               (tp9 >> 8) ^ (tp9 << 24) ^
-                               (tpb >> 24) ^ (tpb << 8);
+                       rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
+                           (tp9 >> 8) ^ (tp9 << 24) ^
+                           (tpb >> 24) ^ (tpb << 8);
 #endif
                }
        }
index 7c9d165..663b5a1 100644 (file)
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 
-void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
-                       size_t length, const AES_KEY *key,
-                       unsigned char ivec[AES_BLOCK_SIZE],
-                       unsigned char ecount_buf[AES_BLOCK_SIZE],
-                       unsigned int *num) {
-       CRYPTO_ctr128_encrypt(in,out,length,key,ivec,ecount_buf,num,(block128_f)AES_encrypt);
+void
+AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,
+    size_t length, const AES_KEY *key, unsigned char ivec[AES_BLOCK_SIZE],
+    unsigned char ecount_buf[AES_BLOCK_SIZE], unsigned int *num)
+{
+       CRYPTO_ctr128_encrypt(in, out, length, key, ivec, ecount_buf, num,
+           (block128_f)AES_encrypt);
 }
index 28aa561..f374a5f 100644 (file)
 #include <openssl/aes.h>
 #include "aes_locl.h"
 
-void AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
-                    const AES_KEY *key, const int enc) {
-
-        assert(in && out && key);
-       assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
+void
+AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
+    const AES_KEY *key, const int enc)
+{
+       assert(in && out && key);
+       assert((AES_ENCRYPT == enc) || (AES_DECRYPT == enc));
 
        if (AES_ENCRYPT == enc)
                AES_encrypt(in, out, key);
        else
                AES_decrypt(in, out, key);
 }
-
index c161351..0882a3d 100644 (file)
@@ -56,7 +56,7 @@
 
 #define N_WORDS (AES_BLOCK_SIZE / sizeof(unsigned long))
 typedef struct {
-        unsigned long data[N_WORDS];
+       unsigned long data[N_WORDS];
 } aes_block_t;
 
 /* XXX: probably some better way to do this */
@@ -76,48 +76,44 @@ typedef struct {
 
 /* N.B. The IV for this mode is _twice_ the block size */
 
-void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
-                                        size_t length, const AES_KEY *key,
-                                        unsigned char *ivec, const int enc)
-       {
+void
+AES_ige_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, const int enc)
+{
        size_t n;
        size_t len = length;
 
        OPENSSL_assert(in && out && key && ivec);
-       OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
-       OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
+       OPENSSL_assert((AES_ENCRYPT == enc) || (AES_DECRYPT == enc));
+       OPENSSL_assert((length % AES_BLOCK_SIZE) == 0);
 
        len = length / AES_BLOCK_SIZE;
 
-       if (AES_ENCRYPT == enc)
-               {
-               if (in != out &&
-                   (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in|(size_t)out|(size_t)ivec)%sizeof(long)==0))
-                       {
+       if (AES_ENCRYPT == enc) {
+               if (in != out && (UNALIGNED_MEMOPS_ARE_FAST ||
+                   ((size_t)in|(size_t)out|(size_t)ivec) %
+                   sizeof(long) == 0)) {
                        aes_block_t *ivp = (aes_block_t *)ivec;
                        aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
 
-                       while (len)
-                               {
+                       while (len) {
                                aes_block_t *inp = (aes_block_t *)in;
                                aes_block_t *outp = (aes_block_t *)out;
 
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        outp->data[n] = inp->data[n] ^ ivp->data[n];
                                AES_encrypt((unsigned char *)outp->data, (unsigned char *)outp->data, key);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        outp->data[n] ^= iv2p->data[n];
                                ivp = outp;
                                iv2p = inp;
                                --len;
                                in += AES_BLOCK_SIZE;
                                out += AES_BLOCK_SIZE;
-                               }
+                       }
                        memcpy(ivec, ivp->data, AES_BLOCK_SIZE);
                        memcpy(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE);
-                       }
-               else
-                       {
+               } else {
                        aes_block_t tmp, tmp2;
                        aes_block_t iv;
                        aes_block_t iv2;
@@ -125,13 +121,13 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                        load_block(iv, ivec);
                        load_block(iv2, ivec + AES_BLOCK_SIZE);
 
-                       while (len)
-                               {
+                       while (len) {
                                load_block(tmp, in);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp2.data[n] = tmp.data[n] ^ iv.data[n];
-                               AES_encrypt((unsigned char *)tmp2.data, (unsigned char *)tmp2.data, key);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               AES_encrypt((unsigned char *)tmp2.data,
+                                   (unsigned char *)tmp2.data, key);
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp2.data[n] ^= iv2.data[n];
                                store_block(out, tmp2);
                                iv = tmp2;
@@ -139,41 +135,37 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                                --len;
                                in += AES_BLOCK_SIZE;
                                out += AES_BLOCK_SIZE;
-                               }
+                       }
                        memcpy(ivec, iv.data, AES_BLOCK_SIZE);
                        memcpy(ivec + AES_BLOCK_SIZE, iv2.data, AES_BLOCK_SIZE);
-                       }
                }
-       else
-               {
-               if (in != out &&
-                   (UNALIGNED_MEMOPS_ARE_FAST || ((size_t)in|(size_t)out|(size_t)ivec)%sizeof(long)==0))
-                       {
+       } else {
+               if (in != out && (UNALIGNED_MEMOPS_ARE_FAST ||
+                   ((size_t)in|(size_t)out|(size_t)ivec) %
+                   sizeof(long) == 0)) {
                        aes_block_t *ivp = (aes_block_t *)ivec;
                        aes_block_t *iv2p = (aes_block_t *)(ivec + AES_BLOCK_SIZE);
 
-                       while (len)
-                               {
+                       while (len) {
                                aes_block_t tmp;
                                aes_block_t *inp = (aes_block_t *)in;
                                aes_block_t *outp = (aes_block_t *)out;
 
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp.data[n] = inp->data[n] ^ iv2p->data[n];
-                               AES_decrypt((unsigned char *)tmp.data, (unsigned char *)outp->data, key);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               AES_decrypt((unsigned char *)tmp.data,
+                                   (unsigned char *)outp->data, key);
+                               for (n = 0; n < N_WORDS; ++n)
                                        outp->data[n] ^= ivp->data[n];
                                ivp = inp;
                                iv2p = outp;
                                --len;
                                in += AES_BLOCK_SIZE;
                                out += AES_BLOCK_SIZE;
-                               }
+                       }
                        memcpy(ivec, ivp->data, AES_BLOCK_SIZE);
                        memcpy(ivec + AES_BLOCK_SIZE, iv2p->data, AES_BLOCK_SIZE);
-                       }
-               else
-                       {
+               } else {
                        aes_block_t tmp, tmp2;
                        aes_block_t iv;
                        aes_block_t iv2;
@@ -181,14 +173,14 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                        load_block(iv, ivec);
                        load_block(iv2, ivec + AES_BLOCK_SIZE);
 
-                       while (len)
-                               {
+                       while (len) {
                                load_block(tmp, in);
                                tmp2 = tmp;
-                               for(n=0 ; n < N_WORDS; ++n)
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp.data[n] ^= iv2.data[n];
-                               AES_decrypt((unsigned char *)tmp.data, (unsigned char *)tmp.data, key);
-                               for(n=0 ; n < N_WORDS; ++n)
+                               AES_decrypt((unsigned char *)tmp.data,
+                                   (unsigned char *)tmp.data, key);
+                               for (n = 0; n < N_WORDS; ++n)
                                        tmp.data[n] ^= iv.data[n];
                                store_block(out, tmp);
                                iv = tmp2;
@@ -196,12 +188,12 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
                                --len;
                                in += AES_BLOCK_SIZE;
                                out += AES_BLOCK_SIZE;
-                               }
+                       }
                        memcpy(ivec, iv.data, AES_BLOCK_SIZE);
                        memcpy(ivec + AES_BLOCK_SIZE, iv2.data, AES_BLOCK_SIZE);
-                       }
                }
        }
+}
 
 /*
  * Note that its effectively impossible to do biIGE in anything other
@@ -210,11 +202,11 @@ void AES_ige_encrypt(const unsigned char *in, unsigned char *out,
 
 /* N.B. The IV for this mode is _four times_ the block size */
 
-void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
-                                               size_t length, const AES_KEY *key,
-                                               const AES_KEY *key2, const unsigned char *ivec,
-                                               const int enc)
-       {
+void
+AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, const AES_KEY *key2, const unsigned char *ivec,
+    const int enc)
+{
        size_t n;
        size_t len = length;
        unsigned char tmp[AES_BLOCK_SIZE];
@@ -225,23 +217,21 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
        const unsigned char *iv2;
 
        OPENSSL_assert(in && out && key && ivec);
-       OPENSSL_assert((AES_ENCRYPT == enc)||(AES_DECRYPT == enc));
-       OPENSSL_assert((length%AES_BLOCK_SIZE) == 0);
+       OPENSSL_assert((AES_ENCRYPT == enc) || (AES_DECRYPT == enc));
+       OPENSSL_assert((length % AES_BLOCK_SIZE) == 0);
 
-       if (AES_ENCRYPT == enc)
-               {
+       if (AES_ENCRYPT == enc) {
                /* XXX: Do a separate case for when in != out (strictly should
                   check for overlap, too) */
 
-               /* First the forward pass */ 
+               /* First the forward pass */
                iv = ivec;
                iv2 = ivec + AES_BLOCK_SIZE;
-               while (len >= AES_BLOCK_SIZE)
-                       {
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+               while (len >= AES_BLOCK_SIZE) {
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] = in[n] ^ iv[n];
                        AES_encrypt(out, out, key);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv2[n];
                        iv = out;
                        memcpy(prev, in, AES_BLOCK_SIZE);
@@ -249,68 +239,63 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
                        len -= AES_BLOCK_SIZE;
                        in += AES_BLOCK_SIZE;
                        out += AES_BLOCK_SIZE;
-                       }
+               }
 
                /* And now backwards */
                iv = ivec + AES_BLOCK_SIZE*2;
                iv2 = ivec + AES_BLOCK_SIZE*3;
                len = length;
-               while(len >= AES_BLOCK_SIZE)
-                       {
+               while (len >= AES_BLOCK_SIZE) {
                        out -= AES_BLOCK_SIZE;
                        /* XXX: reduce copies by alternating between buffers */
                        memcpy(tmp, out, AES_BLOCK_SIZE);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv[n];
                        /*                      hexdump(stdout, "out ^ iv", out, AES_BLOCK_SIZE); */
                        AES_encrypt(out, out, key);
                        /*                      hexdump(stdout,"enc", out, AES_BLOCK_SIZE); */
                        /*                      hexdump(stdout,"iv2", iv2, AES_BLOCK_SIZE); */
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv2[n];
                        /*                      hexdump(stdout,"out", out, AES_BLOCK_SIZE); */
                        iv = out;
                        memcpy(prev, tmp, AES_BLOCK_SIZE);
                        iv2 = prev;
                        len -= AES_BLOCK_SIZE;
-                       }
                }
-       else
-               {
+       } else {
                /* First backwards */
                iv = ivec + AES_BLOCK_SIZE*2;
                iv2 = ivec + AES_BLOCK_SIZE*3;
                in += length;
                out += length;
-               while (len >= AES_BLOCK_SIZE)
-                       {
+               while (len >= AES_BLOCK_SIZE) {
                        in -= AES_BLOCK_SIZE;
                        out -= AES_BLOCK_SIZE;
                        memcpy(tmp, in, AES_BLOCK_SIZE);
                        memcpy(tmp2, in, AES_BLOCK_SIZE);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                tmp[n] ^= iv2[n];
                        AES_decrypt(tmp, out, key);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv[n];
                        memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
                        iv = tmp3;
                        iv2 = out;
                        len -= AES_BLOCK_SIZE;
-                       }
+               }
 
                /* And now forwards */
                iv = ivec;
                iv2 = ivec + AES_BLOCK_SIZE;
                len = length;
-               while (len >= AES_BLOCK_SIZE)
-                       {
+               while (len >= AES_BLOCK_SIZE) {
                        memcpy(tmp, out, AES_BLOCK_SIZE);
                        memcpy(tmp2, out, AES_BLOCK_SIZE);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                tmp[n] ^= iv2[n];
                        AES_decrypt(tmp, out, key);
-                       for(n=0 ; n < AES_BLOCK_SIZE ; ++n)
+                       for (n = 0; n < AES_BLOCK_SIZE; ++n)
                                out[n] ^= iv[n];
                        memcpy(tmp3, tmp2, AES_BLOCK_SIZE);
                        iv = tmp3;
@@ -318,6 +303,6 @@ void AES_bi_ige_encrypt(const unsigned char *in, unsigned char *out,
                        len -= AES_BLOCK_SIZE;
                        in += AES_BLOCK_SIZE;
                        out += AES_BLOCK_SIZE;
-                       }
                }
        }
+}
index f083488..d666c06 100644 (file)
 
 const char AES_version[]="AES" OPENSSL_VERSION_PTEXT;
 
-const char *AES_options(void) {
+const char
+*AES_options(void) {
 #ifdef FULL_UNROLL
-        return "aes(full)";
+       return "aes(full)";
 #else   
-        return "aes(partial)";
+       return "aes(partial)";
 #endif
 }
 
 /* FIPS wrapper functions to block low level AES calls in FIPS mode */
 
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key)
-       {
+int
+AES_set_encrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
 #ifdef OPENSSL_FIPS
        fips_cipher_abort(AES);
 #endif
        return private_AES_set_encrypt_key(userKey, bits, key);
-       }
+}
 
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key)
-       {
+int
+AES_set_decrypt_key(const unsigned char *userKey, const int bits,
+    AES_KEY *key)
+{
 #ifdef OPENSSL_FIPS
        fips_cipher_abort(AES);
 #endif
        return private_AES_set_decrypt_key(userKey, bits, key);
-       }
+}
index 50bf0b8..f5a35b2 100644 (file)
 #include <openssl/aes.h>
 #include <openssl/modes.h>
 
-void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,
-       size_t length, const AES_KEY *key,
-       unsigned char *ivec, int *num)
+void
+AES_ofb128_encrypt(const unsigned char *in, unsigned char *out, size_t length,
+    const AES_KEY *key, unsigned char *ivec, int *num)
 {
-       CRYPTO_ofb128_encrypt(in,out,length,key,ivec,num,(block128_f)AES_encrypt);
+       CRYPTO_ofb128_encrypt(in, out, length, key, ivec, num,
+           (block128_f)AES_encrypt);
 }
index e2d73d3..198b0be 100644 (file)
 #include <openssl/bio.h>
 
 static const unsigned char default_iv[] = {
-  0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
+       0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6, 0xA6,
 };
 
-int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, unsigned int inlen)
-       {
+int
+AES_wrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen)
+{
        unsigned char *A, B[16], *R;
        unsigned int i, j, t;
        if ((inlen & 0x7) || (inlen < 8))
@@ -75,31 +75,28 @@ int AES_wrap_key(AES_KEY *key, const unsigned char *iv,
 
        memcpy(A, iv, 8);
 
-       for (j = 0; j < 6; j++)
-               {
+       for (j = 0; j < 6; j++) {
                R = out + 8;
-               for (i = 0; i < inlen; i += 8, t++, R += 8)
-                       {
+               for (i = 0; i < inlen; i += 8, t++, R += 8) {
                        memcpy(B + 8, R, 8);
                        AES_encrypt(B, B, key);
                        A[7] ^= (unsigned char)(t & 0xff);
-                       if (t > 0xff)   
-                               {
+                       if (t > 0xff) {
                                A[6] ^= (unsigned char)((t >> 8) & 0xff);
                                A[5] ^= (unsigned char)((t >> 16) & 0xff);
                                A[4] ^= (unsigned char)((t >> 24) & 0xff);
-                               }
-                       memcpy(R, B + 8, 8);
                        }
+                       memcpy(R, B + 8, 8);
                }
+       }
        memcpy(out, A, 8);
        return inlen + 8;
-       }
+}
 
-int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
-               unsigned char *out,
-               const unsigned char *in, unsigned int inlen)
-       {
+int
+AES_unwrap_key(AES_KEY *key, const unsigned char *iv, unsigned char *out,
+    const unsigned char *in, unsigned int inlen)
+{
        unsigned char *A, B[16], *R;
        unsigned int i, j, t;
        inlen -= 8;
@@ -108,43 +105,39 @@ int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
        if (inlen < 8)
                return -1;
        A = B;
-       t =  6 * (inlen >> 3);
+       t = 6 * (inlen >> 3);
        memcpy(A, in, 8);
        memcpy(out, in + 8, inlen);
-       for (j = 0; j < 6; j++)
-               {
+       for (j = 0; j < 6; j++) {
                R = out + inlen - 8;
-               for (i = 0; i < inlen; i += 8, t--, R -= 8)
-                       {
+               for (i = 0; i < inlen; i += 8, t--, R -= 8) {
                        A[7] ^= (unsigned char)(t & 0xff);
-                       if (t > 0xff)   
-                               {
+                       if (t > 0xff) {
                                A[6] ^= (unsigned char)((t >> 8) & 0xff);
                                A[5] ^= (unsigned char)((t >> 16) & 0xff);
                                A[4] ^= (unsigned char)((t >> 24) & 0xff);
-                               }
+                       }
                        memcpy(B + 8, R, 8);
                        AES_decrypt(B, B, key);
                        memcpy(R, B + 8, 8);
-                       }
                }
+       }
        if (!iv)
                iv = default_iv;
-       if (memcmp(A, iv, 8))
-               {
+       if (memcmp(A, iv, 8)) {
                OPENSSL_cleanse(out, inlen);
                return 0;
-               }
-       return inlen;
        }
+       return inlen;
+}
 
 #ifdef AES_WRAP_TEST
 
-int AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
-                        const unsigned char *iv,
-                        const unsigned char *eout,
-                        const unsigned char *key, int keylen)
-       {
+int
+AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
+    const unsigned char *iv, const unsigned char *eout,
+    const unsigned char *key, int keylen)
+{
        unsigned char *otmp = NULL, *ptmp = NULL;
        int r, ret = 0;
        AES_KEY wctx;
@@ -160,7 +153,7 @@ int AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
 
        if (eout && memcmp(eout, otmp, keylen))
                goto err;
-               
+
        if (AES_set_decrypt_key(kek, keybits, &wctx))
                goto err;
        r = AES_unwrap_key(&wctx, iv, ptmp, otmp, r);
@@ -170,74 +163,72 @@ int AES_wrap_unwrap_test(const unsigned char *kek, int keybits,
 
        ret = 1;
 
-       err:
+err:
        if (otmp)
                OPENSSL_free(otmp);
        if (ptmp)
                OPENSSL_free(ptmp);
 
        return ret;
-
-       }
-
+}
 
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-
-static const unsigned char kek[] = {
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-  0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-  0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
-};
-
-static const unsigned char key[] = {
-  0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-  0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
-  0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-  0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
-};
-
-static const unsigned char e1[] = {
-  0x1f, 0xa6, 0x8b, 0x0a, 0x81, 0x12, 0xb4, 0x47,
-  0xae, 0xf3, 0x4b, 0xd8, 0xfb, 0x5a, 0x7b, 0x82,
-  0x9d, 0x3e, 0x86, 0x23, 0x71, 0xd2, 0xcf, 0xe5
-};
-
-static const unsigned char e2[] = {
-  0x96, 0x77, 0x8b, 0x25, 0xae, 0x6c, 0xa4, 0x35,
-  0xf9, 0x2b, 0x5b, 0x97, 0xc0, 0x50, 0xae, 0xd2,
-  0x46, 0x8a, 0xb8, 0xa1, 0x7a, 0xd8, 0x4e, 0x5d
-};
-
-static const unsigned char e3[] = {
-  0x64, 0xe8, 0xc3, 0xf9, 0xce, 0x0f, 0x5b, 0xa2,
-  0x63, 0xe9, 0x77, 0x79, 0x05, 0x81, 0x8a, 0x2a,
-  0x93, 0xc8, 0x19, 0x1e, 0x7d, 0x6e, 0x8a, 0xe7
-};
-
-static const unsigned char e4[] = {
-  0x03, 0x1d, 0x33, 0x26, 0x4e, 0x15, 0xd3, 0x32,
-  0x68, 0xf2, 0x4e, 0xc2, 0x60, 0x74, 0x3e, 0xdc,
-  0xe1, 0xc6, 0xc7, 0xdd, 0xee, 0x72, 0x5a, 0x93,
-  0x6b, 0xa8, 0x14, 0x91, 0x5c, 0x67, 0x62, 0xd2
-};
-
-static const unsigned char e5[] = {
-  0xa8, 0xf9, 0xbc, 0x16, 0x12, 0xc6, 0x8b, 0x3f,
-  0xf6, 0xe6, 0xf4, 0xfb, 0xe3, 0x0e, 0x71, 0xe4,
-  0x76, 0x9c, 0x8b, 0x80, 0xa3, 0x2c, 0xb8, 0x95,
-  0x8c, 0xd5, 0xd1, 0x7d, 0x6b, 0x25, 0x4d, 0xa1
-};
-
-static const unsigned char e6[] = {
-  0x28, 0xc9, 0xf4, 0x04, 0xc4, 0xb8, 0x10, 0xf4,
-  0xcb, 0xcc, 0xb3, 0x5c, 0xfb, 0x87, 0xf8, 0x26,
-  0x3f, 0x57, 0x86, 0xe2, 0xd8, 0x0e, 0xd3, 0x26,
-  0xcb, 0xc7, 0xf0, 0xe7, 0x1a, 0x99, 0xf4, 0x3b,
-  0xfb, 0x98, 0x8b, 0x9b, 0x7a, 0x02, 0xdd, 0x21
-};
+       static const unsigned char kek[] = {
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+               0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+               0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
+               0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f
+       };
+
+       static const unsigned char key[] = {
+               0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
+               0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff,
+               0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+               0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
+       };
+
+       static const unsigned char e1[] = {
+               0x1f, 0xa6, 0x8b, 0x0a, 0x81, 0x12, 0xb4, 0x47,
+               0xae, 0xf3, 0x4b, 0xd8, 0xfb, 0x5a, 0x7b, 0x82,
+               0x9d, 0x3e, 0x86, 0x23, 0x71, 0xd2, 0xcf, 0xe5
+       };
+
+       static const unsigned char e2[] = {
+               0x96, 0x77, 0x8b, 0x25, 0xae, 0x6c, 0xa4, 0x35,
+               0xf9, 0x2b, 0x5b, 0x97, 0xc0, 0x50, 0xae, 0xd2,
+               0x46, 0x8a, 0xb8, 0xa1, 0x7a, 0xd8, 0x4e, 0x5d
+       };
+
+       static const unsigned char e3[] = {
+               0x64, 0xe8, 0xc3, 0xf9, 0xce, 0x0f, 0x5b, 0xa2,
+               0x63, 0xe9, 0x77, 0x79, 0x05, 0x81, 0x8a, 0x2a,
+               0x93, 0xc8, 0x19, 0x1e, 0x7d, 0x6e, 0x8a, 0xe7
+       };
+
+       static const unsigned char e4[] = {
+               0x03, 0x1d, 0x33, 0x26, 0x4e, 0x15, 0xd3, 0x32,
+               0x68, 0xf2, 0x4e, 0xc2, 0x60, 0x74, 0x3e, 0xdc,
+               0xe1, 0xc6, 0xc7, 0xdd, 0xee, 0x72, 0x5a, 0x93,
+               0x6b, 0xa8, 0x14, 0x91, 0x5c, 0x67, 0x62, 0xd2
+       };
+
+       static const unsigned char e5[] = {
+               0xa8, 0xf9, 0xbc, 0x16, 0x12, 0xc6, 0x8b, 0x3f,
+               0xf6, 0xe6, 0xf4, 0xfb, 0xe3, 0x0e, 0x71, 0xe4,
+               0x76, 0x9c, 0x8b, 0x80, 0xa3, 0x2c, 0xb8, 0x95,
+               0x8c, 0xd5, 0xd1, 0x7d, 0x6b, 0x25, 0x4d, 0xa1
+       };
+
+       static const unsigned char e6[] = {
+               0x28, 0xc9, 0xf4, 0x04, 0xc4, 0xb8, 0x10, 0xf4,
+               0xcb, 0xcc, 0xb3, 0x5c, 0xfb, 0x87, 0xf8, 0x26,
+               0x3f, 0x57, 0x86, 0xe2, 0xd8, 0x0e, 0xd3, 0x26,
+               0xcb, 0xc7, 0xf0, 0xe7, 0x1a, 0x99, 0xf4, 0x3b,
+               0xfb, 0x98, 0x8b, 0x9b, 0x7a, 0x02, 0xdd, 0x21
+       };
 
        AES_KEY wctx, xctx;
        int ret;
@@ -254,6 +245,5 @@ static const unsigned char e6[] = {
        ret = AES_wrap_unwrap_test(kek, 256, NULL, e6, key, 32);
        fprintf(stderr, "Key test result %d\n", ret);
 }
-       
-       
+
 #endif
index d323e26..c5d17b3 100644 (file)
 #endif
 
 #if 1
-static void prefetch256(const void *table)
+static void
+prefetch256(const void *table)
 {
-       volatile unsigned long *t=(void *)table,ret;
+       volatile unsigned long *t = (void *)table, ret;
        unsigned long sum;
        int i;
 
        /* 32 is common least cache-line size */
-       for (sum=0,i=0;i<256/sizeof(t[0]);i+=32/sizeof(t[0]))   sum ^= t[i];
+       for (sum = 0, i = 0; i < 256/sizeof(t[0]); i += 32 / sizeof(t[0]))
+               sum ^= t[i];
 
        ret = sum;
 }
@@ -128,350 +130,350 @@ Td4[x] = Si[x].[01];
 #define Td3 (u32)((u64*)((u8*)Td+1))
 
 static const u64 Te[256] = {
-    U64(0xa56363c6a56363c6), U64(0x847c7cf8847c7cf8),
-    U64(0x997777ee997777ee), U64(0x8d7b7bf68d7b7bf6),
-    U64(0x0df2f2ff0df2f2ff), U64(0xbd6b6bd6bd6b6bd6),
-    U64(0xb16f6fdeb16f6fde), U64(0x54c5c59154c5c591),
-    U64(0x5030306050303060), U64(0x0301010203010102),
-    U64(0xa96767cea96767ce), U64(0x7d2b2b567d2b2b56),
-    U64(0x19fefee719fefee7), U64(0x62d7d7b562d7d7b5),
-    U64(0xe6abab4de6abab4d), U64(0x9a7676ec9a7676ec),
-    U64(0x45caca8f45caca8f), U64(0x9d82821f9d82821f),
-    U64(0x40c9c98940c9c989), U64(0x877d7dfa877d7dfa),
-    U64(0x15fafaef15fafaef), U64(0xeb5959b2eb5959b2),
-    U64(0xc947478ec947478e), U64(0x0bf0f0fb0bf0f0fb),
-    U64(0xecadad41ecadad41), U64(0x67d4d4b367d4d4b3),
-    U64(0xfda2a25ffda2a25f), U64(0xeaafaf45eaafaf45),
-    U64(0xbf9c9c23bf9c9c23), U64(0xf7a4a453f7a4a453),
-    U64(0x967272e4967272e4), U64(0x5bc0c09b5bc0c09b),
-    U64(0xc2b7b775c2b7b775), U64(0x1cfdfde11cfdfde1),
-    U64(0xae93933dae93933d), U64(0x6a26264c6a26264c),
-    U64(0x5a36366c5a36366c), U64(0x413f3f7e413f3f7e),
-    U64(0x02f7f7f502f7f7f5), U64(0x4fcccc834fcccc83),
-    U64(0x5c3434685c343468), U64(0xf4a5a551f4a5a551),
-    U64(0x34e5e5d134e5e5d1), U64(0x08f1f1f908f1f1f9),
-    U64(0x937171e2937171e2), U64(0x73d8d8ab73d8d8ab),
-    U64(0x5331316253313162), U64(0x3f15152a3f15152a),
-    U64(0x0c0404080c040408), U64(0x52c7c79552c7c795),
-    U64(0x6523234665232346), U64(0x5ec3c39d5ec3c39d),
-    U64(0x2818183028181830), U64(0xa1969637a1969637),
-    U64(0x0f05050a0f05050a), U64(0xb59a9a2fb59a9a2f),
-    U64(0x0907070e0907070e), U64(0x3612122436121224),
-    U64(0x9b80801b9b80801b), U64(0x3de2e2df3de2e2df),
-    U64(0x26ebebcd26ebebcd), U64(0x6927274e6927274e),
-    U64(0xcdb2b27fcdb2b27f), U64(0x9f7575ea9f7575ea),
-    U64(0x1b0909121b090912), U64(0x9e83831d9e83831d),
-    U64(0x742c2c58742c2c58), U64(0x2e1a1a342e1a1a34),
-    U64(0x2d1b1b362d1b1b36), U64(0xb26e6edcb26e6edc),
-    U64(0xee5a5ab4ee5a5ab4), U64(0xfba0a05bfba0a05b),
-    U64(0xf65252a4f65252a4), U64(0x4d3b3b764d3b3b76),
-    U64(0x61d6d6b761d6d6b7), U64(0xceb3b37dceb3b37d),
-    U64(0x7b2929527b292952), U64(0x3ee3e3dd3ee3e3dd),
-    U64(0x712f2f5e712f2f5e), U64(0x9784841397848413),
-    U64(0xf55353a6f55353a6), U64(0x68d1d1b968d1d1b9),
-    U64(0x0000000000000000), U64(0x2cededc12cededc1),
-    U64(0x6020204060202040), U64(0x1ffcfce31ffcfce3),
-    U64(0xc8b1b179c8b1b179), U64(0xed5b5bb6ed5b5bb6),
-    U64(0xbe6a6ad4be6a6ad4), U64(0x46cbcb8d46cbcb8d),
-    U64(0xd9bebe67d9bebe67), U64(0x4b3939724b393972),
-    U64(0xde4a4a94de4a4a94), U64(0xd44c4c98d44c4c98),
-    U64(0xe85858b0e85858b0), U64(0x4acfcf854acfcf85),
-    U64(0x6bd0d0bb6bd0d0bb), U64(0x2aefefc52aefefc5),
-    U64(0xe5aaaa4fe5aaaa4f), U64(0x16fbfbed16fbfbed),
-    U64(0xc5434386c5434386), U64(0xd74d4d9ad74d4d9a),
-    U64(0x5533336655333366), U64(0x9485851194858511),
-    U64(0xcf45458acf45458a), U64(0x10f9f9e910f9f9e9),
-    U64(0x0602020406020204), U64(0x817f7ffe817f7ffe),
-    U64(0xf05050a0f05050a0), U64(0x443c3c78443c3c78),
-    U64(0xba9f9f25ba9f9f25), U64(0xe3a8a84be3a8a84b),
-    U64(0xf35151a2f35151a2), U64(0xfea3a35dfea3a35d),
-    U64(0xc0404080c0404080), U64(0x8a8f8f058a8f8f05),
-    U64(0xad92923fad92923f), U64(0xbc9d9d21bc9d9d21),
-    U64(0x4838387048383870), U64(0x04f5f5f104f5f5f1),
-    U64(0xdfbcbc63dfbcbc63), U64(0xc1b6b677c1b6b677),
-    U64(0x75dadaaf75dadaaf), U64(0x6321214263212142),
-    U64(0x3010102030101020), U64(0x1affffe51affffe5),
-    U64(0x0ef3f3fd0ef3f3fd), U64(0x6dd2d2bf6dd2d2bf),
-    U64(0x4ccdcd814ccdcd81), U64(0x140c0c18140c0c18),
-    U64(0x3513132635131326), U64(0x2fececc32fececc3),
-    U64(0xe15f5fbee15f5fbe), U64(0xa2979735a2979735),
-    U64(0xcc444488cc444488), U64(0x3917172e3917172e),
-    U64(0x57c4c49357c4c493), U64(0xf2a7a755f2a7a755),
-    U64(0x827e7efc827e7efc), U64(0x473d3d7a473d3d7a),
-    U64(0xac6464c8ac6464c8), U64(0xe75d5dbae75d5dba),
-    U64(0x2b1919322b191932), U64(0x957373e6957373e6),
-    U64(0xa06060c0a06060c0), U64(0x9881811998818119),
-    U64(0xd14f4f9ed14f4f9e), U64(0x7fdcdca37fdcdca3),
-    U64(0x6622224466222244), U64(0x7e2a2a547e2a2a54),
-    U64(0xab90903bab90903b), U64(0x8388880b8388880b),
-    U64(0xca46468cca46468c), U64(0x29eeeec729eeeec7),
-    U64(0xd3b8b86bd3b8b86b), U64(0x3c1414283c141428),
-    U64(0x79dedea779dedea7), U64(0xe25e5ebce25e5ebc),
-    U64(0x1d0b0b161d0b0b16), U64(0x76dbdbad76dbdbad),
-    U64(0x3be0e0db3be0e0db), U64(0x5632326456323264),
-    U64(0x4e3a3a744e3a3a74), U64(0x1e0a0a141e0a0a14),
-    U64(0xdb494992db494992), U64(0x0a06060c0a06060c),
-    U64(0x6c2424486c242448), U64(0xe45c5cb8e45c5cb8),
-    U64(0x5dc2c29f5dc2c29f), U64(0x6ed3d3bd6ed3d3bd),
-    U64(0xefacac43efacac43), U64(0xa66262c4a66262c4),
-    U64(0xa8919139a8919139), U64(0xa4959531a4959531),
-    U64(0x37e4e4d337e4e4d3), U64(0x8b7979f28b7979f2),
-    U64(0x32e7e7d532e7e7d5), U64(0x43c8c88b43c8c88b),
-    U64(0x5937376e5937376e), U64(0xb76d6ddab76d6dda),
-    U64(0x8c8d8d018c8d8d01), U64(0x64d5d5b164d5d5b1),
-    U64(0xd24e4e9cd24e4e9c), U64(0xe0a9a949e0a9a949),
-    U64(0xb46c6cd8b46c6cd8), U64(0xfa5656acfa5656ac),
-    U64(0x07f4f4f307f4f4f3), U64(0x25eaeacf25eaeacf),
-    U64(0xaf6565caaf6565ca), U64(0x8e7a7af48e7a7af4),
-    U64(0xe9aeae47e9aeae47), U64(0x1808081018080810),
-    U64(0xd5baba6fd5baba6f), U64(0x887878f0887878f0),
-    U64(0x6f25254a6f25254a), U64(0x722e2e5c722e2e5c),
-    U64(0x241c1c38241c1c38), U64(0xf1a6a657f1a6a657),
-    U64(0xc7b4b473c7b4b473), U64(0x51c6c69751c6c697),
-    U64(0x23e8e8cb23e8e8cb), U64(0x7cdddda17cdddda1),
-    U64(0x9c7474e89c7474e8), U64(0x211f1f3e211f1f3e),
-    U64(0xdd4b4b96dd4b4b96), U64(0xdcbdbd61dcbdbd61),
-    U64(0x868b8b0d868b8b0d), U64(0x858a8a0f858a8a0f),
-    U64(0x907070e0907070e0), U64(0x423e3e7c423e3e7c),
-    U64(0xc4b5b571c4b5b571), U64(0xaa6666ccaa6666cc),
-    U64(0xd8484890d8484890), U64(0x0503030605030306),
-    U64(0x01f6f6f701f6f6f7), U64(0x120e0e1c120e0e1c),
-    U64(0xa36161c2a36161c2), U64(0x5f35356a5f35356a),
-    U64(0xf95757aef95757ae), U64(0xd0b9b969d0b9b969),
-    U64(0x9186861791868617), U64(0x58c1c19958c1c199),
-    U64(0x271d1d3a271d1d3a), U64(0xb99e9e27b99e9e27),
-    U64(0x38e1e1d938e1e1d9), U64(0x13f8f8eb13f8f8eb),
-    U64(0xb398982bb398982b), U64(0x3311112233111122),
-    U64(0xbb6969d2bb6969d2), U64(0x70d9d9a970d9d9a9),
-    U64(0x898e8e07898e8e07), U64(0xa7949433a7949433),
-    U64(0xb69b9b2db69b9b2d), U64(0x221e1e3c221e1e3c),
-    U64(0x9287871592878715), U64(0x20e9e9c920e9e9c9),
-    U64(0x49cece8749cece87), U64(0xff5555aaff5555aa),
-    U64(0x7828285078282850), U64(0x7adfdfa57adfdfa5),
-    U64(0x8f8c8c038f8c8c03), U64(0xf8a1a159f8a1a159),
-    U64(0x8089890980898909), U64(0x170d0d1a170d0d1a),
-    U64(0xdabfbf65dabfbf65), U64(0x31e6e6d731e6e6d7),
-    U64(0xc6424284c6424284), U64(0xb86868d0b86868d0),
-    U64(0xc3414182c3414182), U64(0xb0999929b0999929),
-    U64(0x772d2d5a772d2d5a), U64(0x110f0f1e110f0f1e),
-    U64(0xcbb0b07bcbb0b07b), U64(0xfc5454a8fc5454a8),
-    U64(0xd6bbbb6dd6bbbb6d), U64(0x3a16162c3a16162c)
+       U64(0xa56363c6a56363c6), U64(0x847c7cf8847c7cf8),
+       U64(0x997777ee997777ee), U64(0x8d7b7bf68d7b7bf6),
+       U64(0x0df2f2ff0df2f2ff), U64(0xbd6b6bd6bd6b6bd6),
+       U64(0xb16f6fdeb16f6fde), U64(0x54c5c59154c5c591),
+       U64(0x5030306050303060), U64(0x0301010203010102),
+       U64(0xa96767cea96767ce), U64(0x7d2b2b567d2b2b56),
+       U64(0x19fefee719fefee7), U64(0x62d7d7b562d7d7b5),
+       U64(0xe6abab4de6abab4d), U64(0x9a7676ec9a7676ec),
+       U64(0x45caca8f45caca8f), U64(0x9d82821f9d82821f),
+       U64(0x40c9c98940c9c989), U64(0x877d7dfa877d7dfa),
+       U64(0x15fafaef15fafaef), U64(0xeb5959b2eb5959b2),
+       U64(0xc947478ec947478e), U64(0x0bf0f0fb0bf0f0fb),
+       U64(0xecadad41ecadad41), U64(0x67d4d4b367d4d4b3),
+       U64(0xfda2a25ffda2a25f), U64(0xeaafaf45eaafaf45),
+       U64(0xbf9c9c23bf9c9c23), U64(0xf7a4a453f7a4a453),
+       U64(0x967272e4967272e4), U64(0x5bc0c09b5bc0c09b),
+       U64(0xc2b7b775c2b7b775), U64(0x1cfdfde11cfdfde1),
+       U64(0xae93933dae93933d), U64(0x6a26264c6a26264c),
+       U64(0x5a36366c5a36366c), U64(0x413f3f7e413f3f7e),
+       U64(0x02f7f7f502f7f7f5), U64(0x4fcccc834fcccc83),
+       U64(0x5c3434685c343468), U64(0xf4a5a551f4a5a551),
+       U64(0x34e5e5d134e5e5d1), U64(0x08f1f1f908f1f1f9),
+       U64(0x937171e2937171e2), U64(0x73d8d8ab73d8d8ab),
+       U64(0x5331316253313162), U64(0x3f15152a3f15152a),
+       U64(0x0c0404080c040408), U64(0x52c7c79552c7c795),
+       U64(0x6523234665232346), U64(0x5ec3c39d5ec3c39d),
+       U64(0x2818183028181830), U64(0xa1969637a1969637),
+       U64(0x0f05050a0f05050a), U64(0xb59a9a2fb59a9a2f),
+       U64(0x0907070e0907070e), U64(0x3612122436121224),
+       U64(0x9b80801b9b80801b), U64(0x3de2e2df3de2e2df),
+       U64(0x26ebebcd26ebebcd), U64(0x6927274e6927274e),
+       U64(0xcdb2b27fcdb2b27f), U64(0x9f7575ea9f7575ea),
+       U64(0x1b0909121b090912), U64(0x9e83831d9e83831d),
+       U64(0x742c2c58742c2c58), U64(0x2e1a1a342e1a1a34),
+       U64(0x2d1b1b362d1b1b36), U64(0xb26e6edcb26e6edc),
+       U64(0xee5a5ab4ee5a5ab4), U64(0xfba0a05bfba0a05b),
+       U64(0xf65252a4f65252a4), U64(0x4d3b3b764d3b3b76),
+       U64(0x61d6d6b761d6d6b7), U64(0xceb3b37dceb3b37d),
+       U64(0x7b2929527b292952), U64(0x3ee3e3dd3ee3e3dd),
+       U64(0x712f2f5e712f2f5e), U64(0x9784841397848413),
+       U64(0xf55353a6f55353a6), U64(0x68d1d1b968d1d1b9),
+       U64(0x0000000000000000), U64(0x2cededc12cededc1),
+       U64(0x6020204060202040), U64(0x1ffcfce31ffcfce3),
+       U64(0xc8b1b179c8b1b179), U64(0xed5b5bb6ed5b5bb6),
+       U64(0xbe6a6ad4be6a6ad4), U64(0x46cbcb8d46cbcb8d),
+       U64(0xd9bebe67d9bebe67), U64(0x4b3939724b393972),
+       U64(0xde4a4a94de4a4a94), U64(0xd44c4c98d44c4c98),
+       U64(0xe85858b0e85858b0), U64(0x4acfcf854acfcf85),
+       U64(0x6bd0d0bb6bd0d0bb), U64(0x2aefefc52aefefc5),
+       U64(0xe5aaaa4fe5aaaa4f), U64(0x16fbfbed16fbfbed),
+       U64(0xc5434386c5434386), U64(0xd74d4d9ad74d4d9a),
+       U64(0x5533336655333366), U64(0x9485851194858511),
+       U64(0xcf45458acf45458a), U64(0x10f9f9e910f9f9e9),
+       U64(0x0602020406020204), U64(0x817f7ffe817f7ffe),
+       U64(0xf05050a0f05050a0), U64(0x443c3c78443c3c78),
+       U64(0xba9f9f25ba9f9f25), U64(0xe3a8a84be3a8a84b),
+       U64(0xf35151a2f35151a2), U64(0xfea3a35dfea3a35d),
+       U64(0xc0404080c0404080), U64(0x8a8f8f058a8f8f05),
+       U64(0xad92923fad92923f), U64(0xbc9d9d21bc9d9d21),
+       U64(0x4838387048383870), U64(0x04f5f5f104f5f5f1),
+       U64(0xdfbcbc63dfbcbc63), U64(0xc1b6b677c1b6b677),
+       U64(0x75dadaaf75dadaaf), U64(0x6321214263212142),
+       U64(0x3010102030101020), U64(0x1affffe51affffe5),
+       U64(0x0ef3f3fd0ef3f3fd), U64(0x6dd2d2bf6dd2d2bf),
+       U64(0x4ccdcd814ccdcd81), U64(0x140c0c18140c0c18),
+       U64(0x3513132635131326), U64(0x2fececc32fececc3),
+       U64(0xe15f5fbee15f5fbe), U64(0xa2979735a2979735),
+       U64(0xcc444488cc444488), U64(0x3917172e3917172e),
+       U64(0x57c4c49357c4c493), U64(0xf2a7a755f2a7a755),
+       U64(0x827e7efc827e7efc), U64(0x473d3d7a473d3d7a),
+       U64(0xac6464c8ac6464c8), U64(0xe75d5dbae75d5dba),
+       U64(0x2b1919322b191932), U64(0x957373e6957373e6),
+       U64(0xa06060c0a06060c0), U64(0x9881811998818119),
+       U64(0xd14f4f9ed14f4f9e), U64(0x7fdcdca37fdcdca3),
+       U64(0x6622224466222244), U64(0x7e2a2a547e2a2a54),
+       U64(0xab90903bab90903b), U64(0x8388880b8388880b),
+       U64(0xca46468cca46468c), U64(0x29eeeec729eeeec7),
+       U64(0xd3b8b86bd3b8b86b), U64(0x3c1414283c141428),
+       U64(0x79dedea779dedea7), U64(0xe25e5ebce25e5ebc),
+       U64(0x1d0b0b161d0b0b16), U64(0x76dbdbad76dbdbad),
+       U64(0x3be0e0db3be0e0db), U64(0x5632326456323264),
+       U64(0x4e3a3a744e3a3a74), U64(0x1e0a0a141e0a0a14),
+       U64(0xdb494992db494992), U64(0x0a06060c0a06060c),
+       U64(0x6c2424486c242448), U64(0xe45c5cb8e45c5cb8),
+       U64(0x5dc2c29f5dc2c29f), U64(0x6ed3d3bd6ed3d3bd),
+       U64(0xefacac43efacac43), U64(0xa66262c4a66262c4),
+       U64(0xa8919139a8919139), U64(0xa4959531a4959531),
+       U64(0x37e4e4d337e4e4d3), U64(0x8b7979f28b7979f2),
+       U64(0x32e7e7d532e7e7d5), U64(0x43c8c88b43c8c88b),
+       U64(0x5937376e5937376e), U64(0xb76d6ddab76d6dda),
+       U64(0x8c8d8d018c8d8d01), U64(0x64d5d5b164d5d5b1),
+       U64(0xd24e4e9cd24e4e9c), U64(0xe0a9a949e0a9a949),
+       U64(0xb46c6cd8b46c6cd8), U64(0xfa5656acfa5656ac),
+       U64(0x07f4f4f307f4f4f3), U64(0x25eaeacf25eaeacf),
+       U64(0xaf6565caaf6565ca), U64(0x8e7a7af48e7a7af4),
+       U64(0xe9aeae47e9aeae47), U64(0x1808081018080810),
+       U64(0xd5baba6fd5baba6f), U64(0x887878f0887878f0),
+       U64(0x6f25254a6f25254a), U64(0x722e2e5c722e2e5c),
+       U64(0x241c1c38241c1c38), U64(0xf1a6a657f1a6a657),
+       U64(0xc7b4b473c7b4b473), U64(0x51c6c69751c6c697),
+       U64(0x23e8e8cb23e8e8cb), U64(0x7cdddda17cdddda1),
+       U64(0x9c7474e89c7474e8), U64(0x211f1f3e211f1f3e),
+       U64(0xdd4b4b96dd4b4b96), U64(0xdcbdbd61dcbdbd61),
+       U64(0x868b8b0d868b8b0d), U64(0x858a8a0f858a8a0f),
+       U64(0x907070e0907070e0), U64(0x423e3e7c423e3e7c),
+       U64(0xc4b5b571c4b5b571), U64(0xaa6666ccaa6666cc),
+       U64(0xd8484890d8484890), U64(0x0503030605030306),
+       U64(0x01f6f6f701f6f6f7), U64(0x120e0e1c120e0e1c),
+       U64(0xa36161c2a36161c2), U64(0x5f35356a5f35356a),
+       U64(0xf95757aef95757ae), U64(0xd0b9b969d0b9b969),
+       U64(0x9186861791868617), U64(0x58c1c19958c1c199),
+       U64(0x271d1d3a271d1d3a), U64(0xb99e9e27b99e9e27),
+       U64(0x38e1e1d938e1e1d9), U64(0x13f8f8eb13f8f8eb),
+       U64(0xb398982bb398982b), U64(0x3311112233111122),
+       U64(0xbb6969d2bb6969d2), U64(0x70d9d9a970d9d9a9),
+       U64(0x898e8e07898e8e07), U64(0xa7949433a7949433),
+       U64(0xb69b9b2db69b9b2d), U64(0x221e1e3c221e1e3c),
+       U64(0x9287871592878715), U64(0x20e9e9c920e9e9c9),
+       U64(0x49cece8749cece87), U64(0xff5555aaff5555aa),
+       U64(0x7828285078282850), U64(0x7adfdfa57adfdfa5),
+       U64(0x8f8c8c038f8c8c03), U64(0xf8a1a159f8a1a159),
+       U64(0x8089890980898909), U64(0x170d0d1a170d0d1a),
+       U64(0xdabfbf65dabfbf65), U64(0x31e6e6d731e6e6d7),
+       U64(0xc6424284c6424284), U64(0xb86868d0b86868d0),
+       U64(0xc3414182c3414182), U64(0xb0999929b0999929),
+       U64(0x772d2d5a772d2d5a), U64(0x110f0f1e110f0f1e),
+       U64(0xcbb0b07bcbb0b07b), U64(0xfc5454a8fc5454a8),
+       U64(0xd6bbbb6dd6bbbb6d), U64(0x3a16162c3a16162c)
 };
 
 static const u8 Te4[256] = {
-    0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
-    0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
-    0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
-    0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
-    0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
-    0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
-    0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
-    0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
-    0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
-    0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
-    0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
-    0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
-    0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
-    0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
-    0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
-    0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
-    0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
-    0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
-    0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
-    0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
-    0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
-    0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
-    0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
-    0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
-    0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
-    0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
-    0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
-    0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
-    0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
-    0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
-    0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
-    0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
+       0x63U, 0x7cU, 0x77U, 0x7bU, 0xf2U, 0x6bU, 0x6fU, 0xc5U,
+       0x30U, 0x01U, 0x67U, 0x2bU, 0xfeU, 0xd7U, 0xabU, 0x76U,
+       0xcaU, 0x82U, 0xc9U, 0x7dU, 0xfaU, 0x59U, 0x47U, 0xf0U,
+       0xadU, 0xd4U, 0xa2U, 0xafU, 0x9cU, 0xa4U, 0x72U, 0xc0U,
+       0xb7U, 0xfdU, 0x93U, 0x26U, 0x36U, 0x3fU, 0xf7U, 0xccU,
+       0x34U, 0xa5U, 0xe5U, 0xf1U, 0x71U, 0xd8U, 0x31U, 0x15U,
+       0x04U, 0xc7U, 0x23U, 0xc3U, 0x18U, 0x96U, 0x05U, 0x9aU,
+       0x07U, 0x12U, 0x80U, 0xe2U, 0xebU, 0x27U, 0xb2U, 0x75U,
+       0x09U, 0x83U, 0x2cU, 0x1aU, 0x1bU, 0x6eU, 0x5aU, 0xa0U,
+       0x52U, 0x3bU, 0xd6U, 0xb3U, 0x29U, 0xe3U, 0x2fU, 0x84U,
+       0x53U, 0xd1U, 0x00U, 0xedU, 0x20U, 0xfcU, 0xb1U, 0x5bU,
+       0x6aU, 0xcbU, 0xbeU, 0x39U, 0x4aU, 0x4cU, 0x58U, 0xcfU,
+       0xd0U, 0xefU, 0xaaU, 0xfbU, 0x43U, 0x4dU, 0x33U, 0x85U,
+       0x45U, 0xf9U, 0x02U, 0x7fU, 0x50U, 0x3cU, 0x9fU, 0xa8U,
+       0x51U, 0xa3U, 0x40U, 0x8fU, 0x92U, 0x9dU, 0x38U, 0xf5U,
+       0xbcU, 0xb6U, 0xdaU, 0x21U, 0x10U, 0xffU, 0xf3U, 0xd2U,
+       0xcdU, 0x0cU, 0x13U, 0xecU, 0x5fU, 0x97U, 0x44U, 0x17U,
+       0xc4U, 0xa7U, 0x7eU, 0x3dU, 0x64U, 0x5dU, 0x19U, 0x73U,
+       0x60U, 0x81U, 0x4fU, 0xdcU, 0x22U, 0x2aU, 0x90U, 0x88U,
+       0x46U, 0xeeU, 0xb8U, 0x14U, 0xdeU, 0x5eU, 0x0bU, 0xdbU,
+       0xe0U, 0x32U, 0x3aU, 0x0aU, 0x49U, 0x06U, 0x24U, 0x5cU,
+       0xc2U, 0xd3U, 0xacU, 0x62U, 0x91U, 0x95U, 0xe4U, 0x79U,
+       0xe7U, 0xc8U, 0x37U, 0x6dU, 0x8dU, 0xd5U, 0x4eU, 0xa9U,
+       0x6cU, 0x56U, 0xf4U, 0xeaU, 0x65U, 0x7aU, 0xaeU, 0x08U,
+       0xbaU, 0x78U, 0x25U, 0x2eU, 0x1cU, 0xa6U, 0xb4U, 0xc6U,
+       0xe8U, 0xddU, 0x74U, 0x1fU, 0x4bU, 0xbdU, 0x8bU, 0x8aU,
+       0x70U, 0x3eU, 0xb5U, 0x66U, 0x48U, 0x03U, 0xf6U, 0x0eU,
+       0x61U, 0x35U, 0x57U, 0xb9U, 0x86U, 0xc1U, 0x1dU, 0x9eU,
+       0xe1U, 0xf8U, 0x98U, 0x11U, 0x69U, 0xd9U, 0x8eU, 0x94U,
+       0x9bU, 0x1eU, 0x87U, 0xe9U, 0xceU, 0x55U, 0x28U, 0xdfU,
+       0x8cU, 0xa1U, 0x89U, 0x0dU, 0xbfU, 0xe6U, 0x42U, 0x68U,
+       0x41U, 0x99U, 0x2dU, 0x0fU, 0xb0U, 0x54U, 0xbbU, 0x16U
 };
 
 static const u64 Td[256] = {
-    U64(0x50a7f45150a7f451), U64(0x5365417e5365417e),
-    U64(0xc3a4171ac3a4171a), U64(0x965e273a965e273a),
-    U64(0xcb6bab3bcb6bab3b), U64(0xf1459d1ff1459d1f),
-    U64(0xab58faacab58faac), U64(0x9303e34b9303e34b),
-    U64(0x55fa302055fa3020), U64(0xf66d76adf66d76ad),
-    U64(0x9176cc889176cc88), U64(0x254c02f5254c02f5),
-    U64(0xfcd7e54ffcd7e54f), U64(0xd7cb2ac5d7cb2ac5),
-    U64(0x8044352680443526), U64(0x8fa362b58fa362b5),
-    U64(0x495ab1de495ab1de), U64(0x671bba25671bba25),
-    U64(0x980eea45980eea45), U64(0xe1c0fe5de1c0fe5d),
-    U64(0x02752fc302752fc3), U64(0x12f04c8112f04c81),
-    U64(0xa397468da397468d), U64(0xc6f9d36bc6f9d36b),
-    U64(0xe75f8f03e75f8f03), U64(0x959c9215959c9215),
-    U64(0xeb7a6dbfeb7a6dbf), U64(0xda595295da595295),
-    U64(0x2d83bed42d83bed4), U64(0xd3217458d3217458),
-    U64(0x2969e0492969e049), U64(0x44c8c98e44c8c98e),
-    U64(0x6a89c2756a89c275), U64(0x78798ef478798ef4),
-    U64(0x6b3e58996b3e5899), U64(0xdd71b927dd71b927),
-    U64(0xb64fe1beb64fe1be), U64(0x17ad88f017ad88f0),
-    U64(0x66ac20c966ac20c9), U64(0xb43ace7db43ace7d),
-    U64(0x184adf63184adf63), U64(0x82311ae582311ae5),
-    U64(0x6033519760335197), U64(0x457f5362457f5362),
-    U64(0xe07764b1e07764b1), U64(0x84ae6bbb84ae6bbb),
-    U64(0x1ca081fe1ca081fe), U64(0x942b08f9942b08f9),
-    U64(0x5868487058684870), U64(0x19fd458f19fd458f),
-    U64(0x876cde94876cde94), U64(0xb7f87b52b7f87b52),
-    U64(0x23d373ab23d373ab), U64(0xe2024b72e2024b72),
-    U64(0x578f1fe3578f1fe3), U64(0x2aab55662aab5566),
-    U64(0x0728ebb20728ebb2), U64(0x03c2b52f03c2b52f),
-    U64(0x9a7bc5869a7bc586), U64(0xa50837d3a50837d3),
-    U64(0xf2872830f2872830), U64(0xb2a5bf23b2a5bf23),
-    U64(0xba6a0302ba6a0302), U64(0x5c8216ed5c8216ed),
-    U64(0x2b1ccf8a2b1ccf8a), U64(0x92b479a792b479a7),
-    U64(0xf0f207f3f0f207f3), U64(0xa1e2694ea1e2694e),
-    U64(0xcdf4da65cdf4da65), U64(0xd5be0506d5be0506),
-    U64(0x1f6234d11f6234d1), U64(0x8afea6c48afea6c4),
-    U64(0x9d532e349d532e34), U64(0xa055f3a2a055f3a2),
-    U64(0x32e18a0532e18a05), U64(0x75ebf6a475ebf6a4),
-    U64(0x39ec830b39ec830b), U64(0xaaef6040aaef6040),
-    U64(0x069f715e069f715e), U64(0x51106ebd51106ebd),
-    U64(0xf98a213ef98a213e), U64(0x3d06dd963d06dd96),
-    U64(0xae053eddae053edd), U64(0x46bde64d46bde64d),
-    U64(0xb58d5491b58d5491), U64(0x055dc471055dc471),
-    U64(0x6fd406046fd40604), U64(0xff155060ff155060),
-    U64(0x24fb981924fb9819), U64(0x97e9bdd697e9bdd6),
-    U64(0xcc434089cc434089), U64(0x779ed967779ed967),
-    U64(0xbd42e8b0bd42e8b0), U64(0x888b8907888b8907),
-    U64(0x385b19e7385b19e7), U64(0xdbeec879dbeec879),
-    U64(0x470a7ca1470a7ca1), U64(0xe90f427ce90f427c),
-    U64(0xc91e84f8c91e84f8), U64(0x0000000000000000),
-    U64(0x8386800983868009), U64(0x48ed2b3248ed2b32),
-    U64(0xac70111eac70111e), U64(0x4e725a6c4e725a6c),
-    U64(0xfbff0efdfbff0efd), U64(0x5638850f5638850f),
-    U64(0x1ed5ae3d1ed5ae3d), U64(0x27392d3627392d36),
-    U64(0x64d90f0a64d90f0a), U64(0x21a65c6821a65c68),
-    U64(0xd1545b9bd1545b9b), U64(0x3a2e36243a2e3624),
-    U64(0xb1670a0cb1670a0c), U64(0x0fe757930fe75793),
-    U64(0xd296eeb4d296eeb4), U64(0x9e919b1b9e919b1b),
-    U64(0x4fc5c0804fc5c080), U64(0xa220dc61a220dc61),
-    U64(0x694b775a694b775a), U64(0x161a121c161a121c),
-    U64(0x0aba93e20aba93e2), U64(0xe52aa0c0e52aa0c0),
-    U64(0x43e0223c43e0223c), U64(0x1d171b121d171b12),
-    U64(0x0b0d090e0b0d090e), U64(0xadc78bf2adc78bf2),
-    U64(0xb9a8b62db9a8b62d), U64(0xc8a91e14c8a91e14),
-    U64(0x8519f1578519f157), U64(0x4c0775af4c0775af),
-    U64(0xbbdd99eebbdd99ee), U64(0xfd607fa3fd607fa3),
-    U64(0x9f2601f79f2601f7), U64(0xbcf5725cbcf5725c),
-    U64(0xc53b6644c53b6644), U64(0x347efb5b347efb5b),
-    U64(0x7629438b7629438b), U64(0xdcc623cbdcc623cb),
-    U64(0x68fcedb668fcedb6), U64(0x63f1e4b863f1e4b8),
-    U64(0xcadc31d7cadc31d7), U64(0x1085634210856342),
-    U64(0x4022971340229713), U64(0x2011c6842011c684),
-    U64(0x7d244a857d244a85), U64(0xf83dbbd2f83dbbd2),
-    U64(0x1132f9ae1132f9ae), U64(0x6da129c76da129c7),
-    U64(0x4b2f9e1d4b2f9e1d), U64(0xf330b2dcf330b2dc),
-    U64(0xec52860dec52860d), U64(0xd0e3c177d0e3c177),
-    U64(0x6c16b32b6c16b32b), U64(0x99b970a999b970a9),
-    U64(0xfa489411fa489411), U64(0x2264e9472264e947),
-    U64(0xc48cfca8c48cfca8), U64(0x1a3ff0a01a3ff0a0),
-    U64(0xd82c7d56d82c7d56), U64(0xef903322ef903322),
-    U64(0xc74e4987c74e4987), U64(0xc1d138d9c1d138d9),
-    U64(0xfea2ca8cfea2ca8c), U64(0x360bd498360bd498),
-    U64(0xcf81f5a6cf81f5a6), U64(0x28de7aa528de7aa5),
-    U64(0x268eb7da268eb7da), U64(0xa4bfad3fa4bfad3f),
-    U64(0xe49d3a2ce49d3a2c), U64(0x0d9278500d927850),
-    U64(0x9bcc5f6a9bcc5f6a), U64(0x62467e5462467e54),
-    U64(0xc2138df6c2138df6), U64(0xe8b8d890e8b8d890),
-    U64(0x5ef7392e5ef7392e), U64(0xf5afc382f5afc382),
-    U64(0xbe805d9fbe805d9f), U64(0x7c93d0697c93d069),
-    U64(0xa92dd56fa92dd56f), U64(0xb31225cfb31225cf),
-    U64(0x3b99acc83b99acc8), U64(0xa77d1810a77d1810),
-    U64(0x6e639ce86e639ce8), U64(0x7bbb3bdb7bbb3bdb),
-    U64(0x097826cd097826cd), U64(0xf418596ef418596e),
-    U64(0x01b79aec01b79aec), U64(0xa89a4f83a89a4f83),
-    U64(0x656e95e6656e95e6), U64(0x7ee6ffaa7ee6ffaa),
-    U64(0x08cfbc2108cfbc21), U64(0xe6e815efe6e815ef),
-    U64(0xd99be7bad99be7ba), U64(0xce366f4ace366f4a),
-    U64(0xd4099fead4099fea), U64(0xd67cb029d67cb029),
-    U64(0xafb2a431afb2a431), U64(0x31233f2a31233f2a),
-    U64(0x3094a5c63094a5c6), U64(0xc066a235c066a235),
-    U64(0x37bc4e7437bc4e74), U64(0xa6ca82fca6ca82fc),
-    U64(0xb0d090e0b0d090e0), U64(0x15d8a73315d8a733),
-    U64(0x4a9804f14a9804f1), U64(0xf7daec41f7daec41),
-    U64(0x0e50cd7f0e50cd7f), U64(0x2ff691172ff69117),
-    U64(0x8dd64d768dd64d76), U64(0x4db0ef434db0ef43),
-    U64(0x544daacc544daacc), U64(0xdf0496e4df0496e4),
-    U64(0xe3b5d19ee3b5d19e), U64(0x1b886a4c1b886a4c),
-    U64(0xb81f2cc1b81f2cc1), U64(0x7f5165467f516546),
-    U64(0x04ea5e9d04ea5e9d), U64(0x5d358c015d358c01),
-    U64(0x737487fa737487fa), U64(0x2e410bfb2e410bfb),
-    U64(0x5a1d67b35a1d67b3), U64(0x52d2db9252d2db92),
-    U64(0x335610e9335610e9), U64(0x1347d66d1347d66d),
-    U64(0x8c61d79a8c61d79a), U64(0x7a0ca1377a0ca137),
-    U64(0x8e14f8598e14f859), U64(0x893c13eb893c13eb),
-    U64(0xee27a9ceee27a9ce), U64(0x35c961b735c961b7),
-    U64(0xede51ce1ede51ce1), U64(0x3cb1477a3cb1477a),
-    U64(0x59dfd29c59dfd29c), U64(0x3f73f2553f73f255),
-    U64(0x79ce141879ce1418), U64(0xbf37c773bf37c773),
-    U64(0xeacdf753eacdf753), U64(0x5baafd5f5baafd5f),
-    U64(0x146f3ddf146f3ddf), U64(0x86db447886db4478),
-    U64(0x81f3afca81f3afca), U64(0x3ec468b93ec468b9),
-    U64(0x2c3424382c342438), U64(0x5f40a3c25f40a3c2),
-    U64(0x72c31d1672c31d16), U64(0x0c25e2bc0c25e2bc),
-    U64(0x8b493c288b493c28), U64(0x41950dff41950dff),
-    U64(0x7101a8397101a839), U64(0xdeb30c08deb30c08),
-    U64(0x9ce4b4d89ce4b4d8), U64(0x90c1566490c15664),
-    U64(0x6184cb7b6184cb7b), U64(0x70b632d570b632d5),
-    U64(0x745c6c48745c6c48), U64(0x4257b8d04257b8d0)
+       U64(0x50a7f45150a7f451), U64(0x5365417e5365417e),
+       U64(0xc3a4171ac3a4171a), U64(0x965e273a965e273a),
+       U64(0xcb6bab3bcb6bab3b), U64(0xf1459d1ff1459d1f),
+       U64(0xab58faacab58faac), U64(0x9303e34b9303e34b),
+       U64(0x55fa302055fa3020), U64(0xf66d76adf66d76ad),
+       U64(0x9176cc889176cc88), U64(0x254c02f5254c02f5),
+       U64(0xfcd7e54ffcd7e54f), U64(0xd7cb2ac5d7cb2ac5),
+       U64(0x8044352680443526), U64(0x8fa362b58fa362b5),
+       U64(0x495ab1de495ab1de), U64(0x671bba25671bba25),
+       U64(0x980eea45980eea45), U64(0xe1c0fe5de1c0fe5d),
+       U64(0x02752fc302752fc3), U64(0x12f04c8112f04c81),
+       U64(0xa397468da397468d), U64(0xc6f9d36bc6f9d36b),
+       U64(0xe75f8f03e75f8f03), U64(0x959c9215959c9215),
+       U64(0xeb7a6dbfeb7a6dbf), U64(0xda595295da595295),
+       U64(0x2d83bed42d83bed4), U64(0xd3217458d3217458),
+       U64(0x2969e0492969e049), U64(0x44c8c98e44c8c98e),
+       U64(0x6a89c2756a89c275), U64(0x78798ef478798ef4),
+       U64(0x6b3e58996b3e5899), U64(0xdd71b927dd71b927),
+       U64(0xb64fe1beb64fe1be), U64(0x17ad88f017ad88f0),
+       U64(0x66ac20c966ac20c9), U64(0xb43ace7db43ace7d),
+       U64(0x184adf63184adf63), U64(0x82311ae582311ae5),
+       U64(0x6033519760335197), U64(0x457f5362457f5362),
+       U64(0xe07764b1e07764b1), U64(0x84ae6bbb84ae6bbb),
+       U64(0x1ca081fe1ca081fe), U64(0x942b08f9942b08f9),
+       U64(0x5868487058684870), U64(0x19fd458f19fd458f),
+       U64(0x876cde94876cde94), U64(0xb7f87b52b7f87b52),
+       U64(0x23d373ab23d373ab), U64(0xe2024b72e2024b72),
+       U64(0x578f1fe3578f1fe3), U64(0x2aab55662aab5566),
+       U64(0x0728ebb20728ebb2), U64(0x03c2b52f03c2b52f),
+       U64(0x9a7bc5869a7bc586), U64(0xa50837d3a50837d3),
+       U64(0xf2872830f2872830), U64(0xb2a5bf23b2a5bf23),
+       U64(0xba6a0302ba6a0302), U64(0x5c8216ed5c8216ed),
+       U64(0x2b1ccf8a2b1ccf8a), U64(0x92b479a792b479a7),
+       U64(0xf0f207f3f0f207f3), U64(0xa1e2694ea1e2694e),
+       U64(0xcdf4da65cdf4da65), U64(0xd5be0506d5be0506),
+       U64(0x1f6234d11f6234d1), U64(0x8afea6c48afea6c4),
+       U64(0x9d532e349d532e34), U64(0xa055f3a2a055f3a2),
+       U64(0x32e18a0532e18a05), U64(0x75ebf6a475ebf6a4),
+       U64(0x39ec830b39ec830b), U64(0xaaef6040aaef6040),
+       U64(0x069f715e069f715e), U64(0x51106ebd51106ebd),
+       U64(0xf98a213ef98a213e), U64(0x3d06dd963d06dd96),
+       U64(0xae053eddae053edd), U64(0x46bde64d46bde64d),
+       U64(0xb58d5491b58d5491), U64(0x055dc471055dc471),
+       U64(0x6fd406046fd40604), U64(0xff155060ff155060),
+       U64(0x24fb981924fb9819), U64(0x97e9bdd697e9bdd6),
+       U64(0xcc434089cc434089), U64(0x779ed967779ed967),
+       U64(0xbd42e8b0bd42e8b0), U64(0x888b8907888b8907),
+       U64(0x385b19e7385b19e7), U64(0xdbeec879dbeec879),
+       U64(0x470a7ca1470a7ca1), U64(0xe90f427ce90f427c),
+       U64(0xc91e84f8c91e84f8), U64(0x0000000000000000),
+       U64(0x8386800983868009), U64(0x48ed2b3248ed2b32),
+       U64(0xac70111eac70111e), U64(0x4e725a6c4e725a6c),
+       U64(0xfbff0efdfbff0efd), U64(0x5638850f5638850f),
+       U64(0x1ed5ae3d1ed5ae3d), U64(0x27392d3627392d36),
+       U64(0x64d90f0a64d90f0a), U64(0x21a65c6821a65c68),
+       U64(0xd1545b9bd1545b9b), U64(0x3a2e36243a2e3624),
+       U64(0xb1670a0cb1670a0c), U64(0x0fe757930fe75793),
+       U64(0xd296eeb4d296eeb4), U64(0x9e919b1b9e919b1b),
+       U64(0x4fc5c0804fc5c080), U64(0xa220dc61a220dc61),
+       U64(0x694b775a694b775a), U64(0x161a121c161a121c),
+       U64(0x0aba93e20aba93e2), U64(0xe52aa0c0e52aa0c0),
+       U64(0x43e0223c43e0223c), U64(0x1d171b121d171b12),
+       U64(0x0b0d090e0b0d090e), U64(0xadc78bf2adc78bf2),
+       U64(0xb9a8b62db9a8b62d), U64(0xc8a91e14c8a91e14),
+       U64(0x8519f1578519f157), U64(0x4c0775af4c0775af),
+       U64(0xbbdd99eebbdd99ee), U64(0xfd607fa3fd607fa3),
+       U64(0x9f2601f79f2601f7), U64(0xbcf5725cbcf5725c),
+       U64(0xc53b6644c53b6644), U64(0x347efb5b347efb5b),
+       U64(0x7629438b7629438b), U64(0xdcc623cbdcc623cb),
+       U64(0x68fcedb668fcedb6), U64(0x63f1e4b863f1e4b8),
+       U64(0xcadc31d7cadc31d7), U64(0x1085634210856342),
+       U64(0x4022971340229713), U64(0x2011c6842011c684),
+       U64(0x7d244a857d244a85), U64(0xf83dbbd2f83dbbd2),
+       U64(0x1132f9ae1132f9ae), U64(0x6da129c76da129c7),
+       U64(0x4b2f9e1d4b2f9e1d), U64(0xf330b2dcf330b2dc),
+       U64(0xec52860dec52860d), U64(0xd0e3c177d0e3c177),
+       U64(0x6c16b32b6c16b32b), U64(0x99b970a999b970a9),
+       U64(0xfa489411fa489411), U64(0x2264e9472264e947),
+       U64(0xc48cfca8c48cfca8), U64(0x1a3ff0a01a3ff0a0),
+       U64(0xd82c7d56d82c7d56), U64(0xef903322ef903322),
+       U64(0xc74e4987c74e4987), U64(0xc1d138d9c1d138d9),
+       U64(0xfea2ca8cfea2ca8c), U64(0x360bd498360bd498),
+       U64(0xcf81f5a6cf81f5a6), U64(0x28de7aa528de7aa5),
+       U64(0x268eb7da268eb7da), U64(0xa4bfad3fa4bfad3f),
+       U64(0xe49d3a2ce49d3a2c), U64(0x0d9278500d927850),
+       U64(0x9bcc5f6a9bcc5f6a), U64(0x62467e5462467e54),
+       U64(0xc2138df6c2138df6), U64(0xe8b8d890e8b8d890),
+       U64(0x5ef7392e5ef7392e), U64(0xf5afc382f5afc382),
+       U64(0xbe805d9fbe805d9f), U64(0x7c93d0697c93d069),
+       U64(0xa92dd56fa92dd56f), U64(0xb31225cfb31225cf),
+       U64(0x3b99acc83b99acc8), U64(0xa77d1810a77d1810),
+       U64(0x6e639ce86e639ce8), U64(0x7bbb3bdb7bbb3bdb),
+       U64(0x097826cd097826cd), U64(0xf418596ef418596e),
+       U64(0x01b79aec01b79aec), U64(0xa89a4f83a89a4f83),
+       U64(0x656e95e6656e95e6), U64(0x7ee6ffaa7ee6ffaa),
+       U64(0x08cfbc2108cfbc21), U64(0xe6e815efe6e815ef),
+       U64(0xd99be7bad99be7ba), U64(0xce366f4ace366f4a),
+       U64(0xd4099fead4099fea), U64(0xd67cb029d67cb029),
+       U64(0xafb2a431afb2a431), U64(0x31233f2a31233f2a),
+       U64(0x3094a5c63094a5c6), U64(0xc066a235c066a235),
+       U64(0x37bc4e7437bc4e74), U64(0xa6ca82fca6ca82fc),
+       U64(0xb0d090e0b0d090e0), U64(0x15d8a73315d8a733),
+       U64(0x4a9804f14a9804f1), U64(0xf7daec41f7daec41),
+       U64(0x0e50cd7f0e50cd7f), U64(0x2ff691172ff69117),
+       U64(0x8dd64d768dd64d76), U64(0x4db0ef434db0ef43),
+       U64(0x544daacc544daacc), U64(0xdf0496e4df0496e4),
+       U64(0xe3b5d19ee3b5d19e), U64(0x1b886a4c1b886a4c),
+       U64(0xb81f2cc1b81f2cc1), U64(0x7f5165467f516546),
+       U64(0x04ea5e9d04ea5e9d), U64(0x5d358c015d358c01),
+       U64(0x737487fa737487fa), U64(0x2e410bfb2e410bfb),
+       U64(0x5a1d67b35a1d67b3), U64(0x52d2db9252d2db92),
+       U64(0x335610e9335610e9), U64(0x1347d66d1347d66d),
+       U64(0x8c61d79a8c61d79a), U64(0x7a0ca1377a0ca137),
+       U64(0x8e14f8598e14f859), U64(0x893c13eb893c13eb),
+       U64(0xee27a9ceee27a9ce), U64(0x35c961b735c961b7),
+       U64(0xede51ce1ede51ce1), U64(0x3cb1477a3cb1477a),
+       U64(0x59dfd29c59dfd29c), U64(0x3f73f2553f73f255),
+       U64(0x79ce141879ce1418), U64(0xbf37c773bf37c773),
+       U64(0xeacdf753eacdf753), U64(0x5baafd5f5baafd5f),
+       U64(0x146f3ddf146f3ddf), U64(0x86db447886db4478),
+       U64(0x81f3afca81f3afca), U64(0x3ec468b93ec468b9),
+       U64(0x2c3424382c342438), U64(0x5f40a3c25f40a3c2),
+       U64(0x72c31d1672c31d16), U64(0x0c25e2bc0c25e2bc),
+       U64(0x8b493c288b493c28), U64(0x41950dff41950dff),
+       U64(0x7101a8397101a839), U64(0xdeb30c08deb30c08),
+       U64(0x9ce4b4d89ce4b4d8), U64(0x90c1566490c15664),
+       U64(0x6184cb7b6184cb7b), U64(0x70b632d570b632d5),
+       U64(0x745c6c48745c6c48), U64(0x4257b8d04257b8d0)
 };
 static const u8 Td4[256] = {
-    0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
-    0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
-    0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
-    0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
-    0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
-    0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
-    0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
-    0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
-    0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
-    0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
-    0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
-    0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
-    0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
-    0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
-    0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
-    0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
-    0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
-    0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
-    0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
-    0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
-    0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
-    0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
-    0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
-    0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
-    0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
-    0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
-    0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
-    0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
-    0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
-    0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
-    0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
-    0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU
+       0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U,
+       0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU,
+       0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U,
+       0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU,
+       0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU,
+       0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU,
+       0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U,
+       0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U,
+       0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U,
+       0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U,
+       0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU,
+       0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U,
+       0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU,
+       0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U,
+       0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U,
+       0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU,
+       0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU,
+       0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U,
+       0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U,
+       0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU,
+       0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U,
+       0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU,
+       0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U,
+       0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U,
+       0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U,
+       0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU,
+       0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU,
+       0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU,
+       0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U,
+       0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U,
+       0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U,
+       0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU
 };
 
 static const u32 rcon[] = {
-    0x00000001U, 0x00000002U, 0x00000004U, 0x00000008U,
-    0x00000010U, 0x00000020U, 0x00000040U, 0x00000080U,
-    0x0000001bU, 0x00000036U, /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
+       0x00000001U, 0x00000002U, 0x00000004U, 0x00000008U,
+       0x00000010U, 0x00000020U, 0x00000040U, 0x00000080U,
+       0x0000001bU, 0x00000036U,
+       /* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
 };
 
 /**
  * Expand the cipher key into the encryption key schedule.
  */
-int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
-                       AES_KEY *key) {
-
+int
+AES_set_encrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key) {
        u32 *rk;
-       int i = 0;
+       int i = 0;
        u32 temp;
 
        if (!userKey || !key)
@@ -481,26 +483,26 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 
        rk = key->rd_key;
 
-       if (bits==128)
+       if (bits == 128)
                key->rounds = 10;
-       else if (bits==192)
+       else if (bits == 192)
                key->rounds = 12;
        else
                key->rounds = 14;
 
-       rk[0] = GETU32(userKey     );
+       rk[0] = GETU32(userKey);
        rk[1] = GETU32(userKey +  4);
        rk[2] = GETU32(userKey +  8);
        rk[3] = GETU32(userKey + 12);
        if (bits == 128) {
                while (1) {
-                       temp  = rk[3];
+                       temp = rk[3];
                        rk[4] = rk[0] ^
-                               (Te4[(temp >>  8) & 0xff]      ) ^
-                               (Te4[(temp >> 16) & 0xff] <<  8) ^
-                               (Te4[(temp >> 24)       ] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 24) ^
-                               rcon[i];
+                           (Te4[(temp >> 8) & 0xff]) ^
+                           (Te4[(temp >> 16) & 0xff] <<  8) ^
+                           (Te4[(temp >> 24)] << 16) ^
+                           (Te4[(temp) & 0xff] << 24) ^
+                           rcon[i];
                        rk[5] = rk[1] ^ rk[4];
                        rk[6] = rk[2] ^ rk[5];
                        rk[7] = rk[3] ^ rk[6];
@@ -514,21 +516,21 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[5] = GETU32(userKey + 20);
        if (bits == 192) {
                while (1) {
-                       temp = rk[ 5];
-                       rk[ 6] = rk[ 0] ^
-                               (Te4[(temp >>  8) & 0xff]      ) ^
-                               (Te4[(temp >> 16) & 0xff] <<  8) ^
-                               (Te4[(temp >> 24)       ] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 24) ^
-                               rcon[i];
-                       rk[ 7] = rk[ 1] ^ rk[ 6];
-                       rk[ 8] = rk[ 2] ^ rk[ 7];
-                       rk[ 9] = rk[ 3] ^ rk[ 8];
+                       temp = rk[5];
+                       rk[6] = rk[ 0] ^
+                           (Te4[(temp >> 8) & 0xff]) ^
+                           (Te4[(temp >> 16) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)] << 16) ^
+                           (Te4[(temp) & 0xff] << 24) ^
+                       rcon[i];
+                       rk[7] = rk[1] ^ rk[6];
+                       rk[8] = rk[2] ^ rk[7];
+                       rk[9] = rk[3] ^ rk[8];
                        if (++i == 8) {
                                return 0;
                        }
-                       rk[10] = rk[ 4] ^ rk[ 9];
-                       rk[11] = rk[ 5] ^ rk[10];
+                       rk[10] = rk[4] ^ rk[9];
+                       rk[11] = rk[5] ^ rk[10];
                        rk += 6;
                }
        }
@@ -536,31 +538,31 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
        rk[7] = GETU32(userKey + 28);
        if (bits == 256) {
                while (1) {
-                       temp = rk[ 7];
-                       rk[ 8] = rk[ 0] ^
-                               (Te4[(temp >>  8) & 0xff]      ) ^
-                               (Te4[(temp >> 16) & 0xff] <<  8) ^
-                               (Te4[(temp >> 24)       ] << 16) ^
-                               (Te4[(temp      ) & 0xff] << 24) ^
-                               rcon[i];
-                       rk[ 9] = rk[ 1] ^ rk[ 8];
-                       rk[10] = rk[ 2] ^ rk[ 9];
-                       rk[11] = rk[ 3] ^ rk[10];
+                       temp = rk[7];
+                       rk[8] = rk[0] ^
+                           (Te4[(temp >> 8) & 0xff]) ^
+                           (Te4[(temp >> 16) & 0xff] << 8) ^
+                           (Te4[(temp >> 24)] << 16) ^
+                           (Te4[(temp) & 0xff] << 24) ^
+                           rcon[i];
+                       rk[9] = rk[1] ^ rk[8];
+                       rk[10] = rk[2] ^ rk[9];
+                       rk[11] = rk[3] ^ rk[10];
                        if (++i == 7) {
                                return 0;
                        }
                        temp = rk[11];
-                       rk[12] = rk[ 4] ^
-                               (Te4[(temp      ) & 0xff]      ) ^
-                               (Te4[(temp >>  8) & 0xff] <<  8) ^
-                               (Te4[(temp >> 16) & 0xff] << 16) ^
-                               (Te4[(temp >> 24)       ] << 24);
-                       rk[13] = rk[ 5] ^ rk[12];
-                       rk[14] = rk[ 6] ^ rk[13];
-                       rk[15] = rk[ 7] ^ rk[14];
+                       rk[12] = rk[4] ^
+                           (Te4[(temp) & 0xff]) ^
+                           (Te4[(temp >> 8) & 0xff] << 8) ^
+                           (Te4[(temp >> 16) & 0xff] << 16) ^
+                           (Te4[(temp >> 24)] << 24);
+                       rk[13] = rk[5] ^ rk[12];
+                       rk[14] = rk[6] ^ rk[13];
+                       rk[15] = rk[7] ^ rk[14];
 
                        rk += 8;
-               }
+               }
        }
        return 0;
 }
@@ -568,10 +570,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 /**
  * Expand the cipher key into the decryption key schedule.
  */
-int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
-                        AES_KEY *key) {
-
-        u32 *rk;
+int
+AES_set_decrypt_key(const unsigned char *userKey, const int bits, AES_KEY *key)
+{
+       u32 *rk;
        int i, j, status;
        u32 temp;
 
@@ -584,10 +586,18 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
 
        /* invert the order of the round keys: */
        for (i = 0, j = 4*(key->rounds); i < j; i += 4, j -= 4) {
-               temp = rk[i    ]; rk[i    ] = rk[j    ]; rk[j    ] = temp;
-               temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-               temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-               temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
+               temp = rk[i];
+               rk[i] = rk[j];
+               rk[j] = temp;
+               temp = rk[i + 1];
+               rk[i + 1] = rk[j + 1];
+               rk[j + 1] = temp;
+               temp = rk[i + 2];
+               rk[i + 2] = rk[j + 2];
+               rk[j + 2] = temp;
+               temp = rk[i + 3];
+               rk[i + 3] = rk[j + 3];
+               rk[j + 3] = temp;
        }
        /* apply the inverse MixColumn transform to all round keys but the first and the last: */
        for (i = 1; i < (key->rounds); i++) {
@@ -599,47 +609,47 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
                        tp1 = rk[j];
                        m = tp1 & 0x80808080;
                        tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp2 & 0x80808080;
                        tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp4 & 0x80808080;
                        tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        tp9 = tp8 ^ tp1;
                        tpb = tp9 ^ tp2;
                        tpd = tp9 ^ tp4;
                        tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-                       rk[j] = tpe ^ ROTATE(tpd,16) ^
-                               ROTATE(tp9,8) ^ ROTATE(tpb,24);
+                       rk[j] = tpe ^ ROTATE(tpd, 16) ^
+                       ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-                       rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-                               (tp9 >> 24) ^ (tp9 << 8) ^
-                               (tpb >> 8) ^ (tpb << 24);
+                       rk[j] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
+                           (tp9 >> 24) ^ (tp9 << 8) ^
+                           (tpb >> 8) ^ (tpb << 24);
 #endif
                }
 #else
                rk[0] =
-                       Td0[Te2[(rk[0]      ) & 0xff] & 0xff] ^
-                       Td1[Te2[(rk[0] >>  8) & 0xff] & 0xff] ^
-                       Td2[Te2[(rk[0] >> 16) & 0xff] & 0xff] ^
-                       Td3[Te2[(rk[0] >> 24)       ] & 0xff];
+                   Td0[Te2[(rk[0]) & 0xff] & 0xff] ^
+                   Td1[Te2[(rk[0] >> 8) & 0xff] & 0xff] ^
+                   Td2[Te2[(rk[0] >> 16) & 0xff] & 0xff] ^
+                   Td3[Te2[(rk[0] >> 24)] & 0xff];
                rk[1] =
-                       Td0[Te2[(rk[1]      ) & 0xff] & 0xff] ^
-                       Td1[Te2[(rk[1] >>  8) & 0xff] & 0xff] ^
-                       Td2[Te2[(rk[1] >> 16) & 0xff] & 0xff] ^
-                       Td3[Te2[(rk[1] >> 24)       ] & 0xff];
+                   Td0[Te2[(rk[1]) & 0xff] & 0xff] ^
+                   Td1[Te2[(rk[1] >> 8) & 0xff] & 0xff] ^
+                   Td2[Te2[(rk[1] >> 16) & 0xff] & 0xff] ^
+                   Td3[Te2[(rk[1] >> 24)] & 0xff];
                rk[2] =
-                       Td0[Te2[(rk[2]      ) & 0xff] & 0xff] ^
-                       Td1[Te2[(rk[2] >>  8) & 0xff] & 0xff] ^
-                       Td2[Te2[(rk[2] >> 16) & 0xff] & 0xff] ^
-                       Td3[Te2[(rk[2] >> 24)       ] & 0xff];
+                   Td0[Te2[(rk[2]) & 0xff] & 0xff] ^
+                   Td1[Te2[(rk[2] >> 8) & 0xff] & 0xff] ^
+                   Td2[Te2[(rk[2] >> 16) & 0xff] & 0xff] ^
+                   Td3[Te2[(rk[2] >> 24)] & 0xff];
                rk[3] =
-                       Td0[Te2[(rk[3]      ) & 0xff] & 0xff] ^
-                       Td1[Te2[(rk[3] >>  8) & 0xff] & 0xff] ^
-                       Td2[Te2[(rk[3] >> 16) & 0xff] & 0xff] ^
-                       Td3[Te2[(rk[3] >> 24)       ] & 0xff];
+                   Td0[Te2[(rk[3]) & 0xff] & 0xff] ^
+                   Td1[Te2[(rk[3] >> 8) & 0xff] & 0xff] ^
+                   Td2[Te2[(rk[3] >> 16) & 0xff] & 0xff] ^
+                   Td3[Te2[(rk[3] >> 24)] & 0xff];
 #endif
        }
        return 0;
@@ -649,9 +659,9 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits,
  * Encrypt a single block
  * in and out can overlap
  */
-void AES_encrypt(const unsigned char *in, unsigned char *out,
-                const AES_KEY *key) {
-
+void
+AES_encrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
+{
        const u32 *rk;
        u32 s0, s1, s2, s3, t[4];
        int r;
@@ -663,197 +673,205 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
         * map byte array block to cipher state
         * and add initial round key:
         */
-       s0 = GETU32(in     ) ^ rk[0];
-       s1 = GETU32(in +  4) ^ rk[1];
-       s2 = GETU32(in +  8) ^ rk[2];
+       s0 = GETU32(in) ^ rk[0];
+       s1 = GETU32(in + 4) ^ rk[1];
+       s2 = GETU32(in + 8) ^ rk[2];
        s3 = GETU32(in + 12) ^ rk[3];
 
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
        prefetch256(Te4);
 
-       t[0] =  Te4[(s0      ) & 0xff]       ^
-               Te4[(s1 >>  8) & 0xff] <<  8 ^
-               Te4[(s2 >> 16) & 0xff] << 16 ^
-               Te4[(s3 >> 24)       ] << 24;
-       t[1] =  Te4[(s1      ) & 0xff]       ^
-               Te4[(s2 >>  8) & 0xff] <<  8 ^
-               Te4[(s3 >> 16) & 0xff] << 16 ^
-               Te4[(s0 >> 24)       ] << 24;
-       t[2] =  Te4[(s2      ) & 0xff]       ^
-               Te4[(s3 >>  8) & 0xff] <<  8 ^
-               Te4[(s0 >> 16) & 0xff] << 16 ^
-               Te4[(s1 >> 24)       ] << 24;
-       t[3] =  Te4[(s3      ) & 0xff]       ^
-               Te4[(s0 >>  8) & 0xff] <<  8 ^
-               Te4[(s1 >> 16) & 0xff] << 16 ^
-               Te4[(s2 >> 24)       ] << 24;
+       t[0] = Te4[(s0) & 0xff] ^
+           Te4[(s1 >> 8) & 0xff] << 8 ^
+           Te4[(s2 >> 16) & 0xff] << 16 ^
+           Te4[(s3 >> 24)] << 24;
+       t[1] = Te4[(s1) & 0xff] ^
+           Te4[(s2 >> 8) & 0xff] << 8 ^
+           Te4[(s3 >> 16) & 0xff] << 16 ^
+           Te4[(s0 >> 24)] << 24;
+       t[2] = Te4[(s2) & 0xff] ^
+           Te4[(s3 >> 8) & 0xff] << 8 ^
+           Te4[(s0 >> 16) & 0xff] << 16 ^
+           Te4[(s1 >> 24)] << 24;
+       t[3] = Te4[(s3) & 0xff] ^
+           Te4[(s0 >> 8) & 0xff] << 8 ^
+           Te4[(s1 >> 16) & 0xff] << 16 ^
+           Te4[(s2 >> 24)] << 24;
 
        /* now do the linear transform using words */
-       {       int i;
+       {
+               int i;
                u32 r0, r1, r2;
 
                for (i = 0; i < 4; i++) {
                        r0 = t[i];
                        r1 = r0 & 0x80808080;
                        r2 = ((r0 & 0x7f7f7f7f) << 1) ^
-                               ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
+                           ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
 #if defined(ROTATE)
-                       t[i] = r2 ^ ROTATE(r2,24) ^ ROTATE(r0,24) ^
-                               ROTATE(r0,16) ^ ROTATE(r0,8);
+                       t[i] = r2 ^ ROTATE(r2, 24) ^ ROTATE(r0, 24) ^
+                           ROTATE(r0, 16) ^ ROTATE(r0, 8);
 #else
                        t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^
-                               (r0 << 16) ^ (r0 >> 16) ^
-                               (r0 << 8) ^ (r0 >> 24);
+                           (r0 << 16) ^ (r0 >> 16) ^ (r0 << 8) ^ (r0 >> 24);
 #endif
-                       t[i] ^= rk[4+i];
+                       t[i] ^= rk[4 + i];
                }
        }
 #else
-       t[0] =  Te0[(s0      ) & 0xff] ^
-               Te1[(s1 >>  8) & 0xff] ^
-               Te2[(s2 >> 16) & 0xff] ^
-               Te3[(s3 >> 24)       ] ^
-               rk[4];
-       t[1] =  Te0[(s1      ) & 0xff] ^
-               Te1[(s2 >>  8) & 0xff] ^
-               Te2[(s3 >> 16) & 0xff] ^
-               Te3[(s0 >> 24)       ] ^
-               rk[5];
-       t[2] =  Te0[(s2      ) & 0xff] ^
-               Te1[(s3 >>  8) & 0xff] ^
-               Te2[(s0 >> 16) & 0xff] ^
-               Te3[(s1 >> 24)       ] ^
-               rk[6];
-       t[3] =  Te0[(s3      ) & 0xff] ^
-               Te1[(s0 >>  8) & 0xff] ^
-               Te2[(s1 >> 16) & 0xff] ^
-               Te3[(s2 >> 24)       ] ^
-               rk[7];
+       t[0] = Te0[(s0) & 0xff] ^
+           Te1[(s1 >> 8) & 0xff] ^
+           Te2[(s2 >> 16) & 0xff] ^
+           Te3[(s3 >> 24)] ^
+           rk[4];
+       t[1] = Te0[(s1) & 0xff] ^
+           Te1[(s2 >> 8) & 0xff] ^
+           Te2[(s3 >> 16) & 0xff] ^
+           Te3[(s0 >> 24)] ^
+           rk[5];
+       t[2] = Te0[(s2) & 0xff] ^
+           Te1[(s3 >> 8) & 0xff] ^
+           Te2[(s0 >> 16) & 0xff] ^
+           Te3[(s1 >> 24)] ^
+           rk[6];
+       t[3] = Te0[(s3) & 0xff] ^
+           Te1[(s0 >> 8) & 0xff] ^
+           Te2[(s1 >> 16) & 0xff] ^
+           Te3[(s2 >> 24)] ^
+           rk[7];
 #endif
-       s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+       s0 = t[0];
+       s1 = t[1];
+       s2 = t[2];
+       s3 = t[3];
 
     /*
      * Nr - 2 full rounds:
      */
-    for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
+       for (rk += 8, r = key->rounds - 2; r > 0; rk += 4, r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-       t[0] =  Te4[(s0      ) & 0xff]       ^
-               Te4[(s1 >>  8) & 0xff] <<  8 ^
-               Te4[(s2 >> 16) & 0xff] << 16 ^
-               Te4[(s3 >> 24)       ] << 24;
-       t[1] =  Te4[(s1      ) & 0xff]       ^
-               Te4[(s2 >>  8) & 0xff] <<  8 ^
-               Te4[(s3 >> 16) & 0xff] << 16 ^
-               Te4[(s0 >> 24)       ] << 24;
-       t[2] =  Te4[(s2      ) & 0xff]       ^
-               Te4[(s3 >>  8) & 0xff] <<  8 ^
-               Te4[(s0 >> 16) & 0xff] << 16 ^
-               Te4[(s1 >> 24)       ] << 24;
-       t[3] =  Te4[(s3      ) & 0xff]       ^
-               Te4[(s0 >>  8) & 0xff] <<  8 ^
-               Te4[(s1 >> 16) & 0xff] << 16 ^
-               Te4[(s2 >> 24)       ] << 24;
+               t[0] = Te4[(s0) & 0xff] ^
+                   Te4[(s1 >> 8) & 0xff] << 8 ^
+                   Te4[(s2 >> 16) & 0xff] << 16 ^
+                   Te4[(s3 >> 24)] << 24;
+               t[1] = Te4[(s1) & 0xff] ^
+                   Te4[(s2 >> 8) & 0xff] << 8 ^
+                   Te4[(s3 >> 16) & 0xff] << 16 ^
+                   Te4[(s0 >> 24)] << 24;
+               t[2] = Te4[(s2) & 0xff] ^
+                   Te4[(s3 >> 8) & 0xff] << 8 ^
+                   Te4[(s0 >> 16) & 0xff] << 16 ^
+                   Te4[(s1 >> 24)] << 24;
+               t[3] = Te4[(s3) & 0xff] ^
+                   Te4[(s0 >> 8) & 0xff] << 8 ^
+                   Te4[(s1 >> 16) & 0xff] << 16 ^
+                   Te4[(s2 >> 24)] << 24;
 
-       /* now do the linear transform using words */
-       {       int i;
-               u32 r0, r1, r2;
+               /* now do the linear transform using words */
+               {
+                       int i;
+                       u32 r0, r1, r2;
 
-               for (i = 0; i < 4; i++) {
-                       r0 = t[i];
-                       r1 = r0 & 0x80808080;
-                       r2 = ((r0 & 0x7f7f7f7f) << 1) ^
-                               ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
+                       for (i = 0; i < 4; i++) {
+                               r0 = t[i];
+                               r1 = r0 & 0x80808080;
+                               r2 = ((r0 & 0x7f7f7f7f) << 1) ^
+                                   ((r1 - (r1 >> 7)) & 0x1b1b1b1b);
 #if defined(ROTATE)
-                       t[i] = r2 ^ ROTATE(r2,24) ^ ROTATE(r0,24) ^
-                               ROTATE(r0,16) ^ ROTATE(r0,8);
+                               t[i] = r2 ^ ROTATE(r2, 24) ^ ROTATE(r0, 24) ^
+                                   ROTATE(r0, 16) ^ ROTATE(r0, 8);
 #else
-                       t[i] = r2 ^ ((r2 ^ r0) << 24) ^ ((r2 ^ r0) >> 8) ^
-                               (r0 << 16) ^ (r0 >> 16) ^
-                               (r0 << 8) ^ (r0 >> 24);
+                               t[i] = r2 ^ ((r2 ^ r0) << 24) ^
+                                   ((r2 ^ r0) >> 8) ^
+                                   (r0 << 16) ^ (r0 >> 16) ^
+                                   (r0 << 8) ^ (r0 >> 24);
 #endif
-                       t[i] ^= rk[i];
+                               t[i] ^= rk[i];
+                       }
                }
-       }
 #else
-       t[0] =  Te0[(s0      ) & 0xff] ^
-               Te1[(s1 >>  8) & 0xff] ^
-               Te2[(s2 >> 16) & 0xff] ^
-               Te3[(s3 >> 24)       ] ^
-               rk[0];
-       t[1] =  Te0[(s1      ) & 0xff] ^
-               Te1[(s2 >>  8) & 0xff] ^
-               Te2[(s3 >> 16) & 0xff] ^
-               Te3[(s0 >> 24)       ] ^
-               rk[1];
-       t[2] =  Te0[(s2      ) & 0xff] ^
-               Te1[(s3 >>  8) & 0xff] ^
-               Te2[(s0 >> 16) & 0xff] ^
-               Te3[(s1 >> 24)       ] ^
-               rk[2];
-       t[3] =  Te0[(s3      ) & 0xff] ^
-               Te1[(s0 >>  8) & 0xff] ^
-               Te2[(s1 >> 16) & 0xff] ^
-               Te3[(s2 >> 24)       ] ^
-               rk[3];
+               t[0] = Te0[(s0) & 0xff] ^
+                   Te1[(s1 >> 8) & 0xff] ^
+                   Te2[(s2 >> 16) & 0xff] ^
+                   Te3[(s3 >> 24)] ^
+                   rk[0];
+               t[1] = Te0[(s1) & 0xff] ^
+                   Te1[(s2 >> 8) & 0xff] ^
+                   Te2[(s3 >> 16) & 0xff] ^
+                   Te3[(s0 >> 24)] ^
+                   rk[1];
+               t[2] = Te0[(s2) & 0xff] ^
+                   Te1[(s3 >> 8) & 0xff] ^
+                   Te2[(s0 >> 16) & 0xff] ^
+                   Te3[(s1 >> 24)] ^
+                   rk[2];
+               t[3] = Te0[(s3) & 0xff] ^
+                   Te1[(s0 >> 8) & 0xff] ^
+                   Te2[(s1 >> 16) & 0xff] ^
+                   Te3[(s2 >> 24)] ^
+                   rk[3];
 #endif
-       s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
-    }
-    /*
+               s0 = t[0];
+               s1 = t[1];
+               s2 = t[2];
+               s3 = t[3];
+       }
+       /*
         * apply last round and
         * map cipher state to byte array block:
         */
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
        prefetch256(Te4);
 
-       *(u32*)(out+0) =
-               Te4[(s0      ) & 0xff]       ^
-               Te4[(s1 >>  8) & 0xff] <<  8 ^
-               Te4[(s2 >> 16) & 0xff] << 16 ^
-               Te4[(s3 >> 24)       ] << 24 ^
-               rk[0];
-       *(u32*)(out+4) =
-               Te4[(s1      ) & 0xff]       ^
-               Te4[(s2 >>  8) & 0xff] <<  8 ^
-               Te4[(s3 >> 16) & 0xff] << 16 ^
-               Te4[(s0 >> 24)       ] << 24 ^
-               rk[1];
-       *(u32*)(out+8) =
-               Te4[(s2      ) & 0xff]       ^
-               Te4[(s3 >>  8) & 0xff] <<  8 ^
-               Te4[(s0 >> 16) & 0xff] << 16 ^
-               Te4[(s1 >> 24)       ] << 24 ^
-               rk[2];
-       *(u32*)(out+12) =
-               Te4[(s3      ) & 0xff]       ^
-               Te4[(s0 >>  8) & 0xff] <<  8 ^
-               Te4[(s1 >> 16) & 0xff] << 16 ^
-               Te4[(s2 >> 24)       ] << 24 ^
-               rk[3];
+       *(u32*)(out + 0) =
+           Te4[(s0) & 0xff] ^
+           Te4[(s1 >> 8) & 0xff] << 8 ^
+           Te4[(s2 >> 16) & 0xff] << 16 ^
+           Te4[(s3 >> 24)] << 24 ^
+           rk[0];
+       *(u32*)(out + 4) =
+           Te4[(s1) & 0xff] ^
+           Te4[(s2 >> 8) & 0xff] << 8 ^
+           Te4[(s3 >> 16) & 0xff] << 16 ^
+           Te4[(s0 >> 24)] << 24 ^
+           rk[1];
+       *(u32*)(out + 8) =
+           Te4[(s2) & 0xff] ^
+           Te4[(s3 >> 8) & 0xff] << 8 ^
+           Te4[(s0 >> 16) & 0xff] << 16 ^
+           Te4[(s1 >> 24)] << 24 ^
+           rk[2];
+       *(u32*)(out + 12) =
+           Te4[(s3) & 0xff] ^
+           Te4[(s0 >> 8) & 0xff] << 8 ^
+           Te4[(s1 >> 16) & 0xff] << 16 ^
+           Te4[(s2 >> 24)] << 24 ^
+           rk[3];
 #else
-       *(u32*)(out+0) =
-               (Te2[(s0      ) & 0xff] & 0x000000ffU) ^
-               (Te3[(s1 >>  8) & 0xff] & 0x0000ff00U) ^
-               (Te0[(s2 >> 16) & 0xff] & 0x00ff0000U) ^
-               (Te1[(s3 >> 24)       ] & 0xff000000U) ^
-               rk[0];
-       *(u32*)(out+4) =
-               (Te2[(s1      ) & 0xff] & 0x000000ffU) ^
-               (Te3[(s2 >>  8) & 0xff] & 0x0000ff00U) ^
-               (Te0[(s3 >> 16) & 0xff] & 0x00ff0000U) ^
-               (Te1[(s0 >> 24)       ] & 0xff000000U) ^
-               rk[1];
-       *(u32*)(out+8) =
-               (Te2[(s2      ) & 0xff] & 0x000000ffU) ^
-               (Te3[(s3 >>  8) & 0xff] & 0x0000ff00U) ^
-               (Te0[(s0 >> 16) & 0xff] & 0x00ff0000U) ^
-               (Te1[(s1 >> 24)       ] & 0xff000000U) ^
-               rk[2];
-       *(u32*)(out+12) =
-               (Te2[(s3      ) & 0xff] & 0x000000ffU) ^
-               (Te3[(s0 >>  8) & 0xff] & 0x0000ff00U) ^
-               (Te0[(s1 >> 16) & 0xff] & 0x00ff0000U) ^
-               (Te1[(s2 >> 24)       ] & 0xff000000U) ^
-               rk[3];
+       *(u32*)(out + 0) =
+           (Te2[(s0) & 0xff] & 0x000000ffU) ^
+           (Te3[(s1 >> 8) & 0xff] & 0x0000ff00U) ^
+           (Te0[(s2 >> 16) & 0xff] & 0x00ff0000U) ^
+           (Te1[(s3 >> 24)] & 0xff000000U) ^
+           rk[0];
+       *(u32*)(out + 4) =
+           (Te2[(s1) & 0xff] & 0x000000ffU) ^
+           (Te3[(s2 >> 8) & 0xff] & 0x0000ff00U) ^
+           (Te0[(s3 >> 16) & 0xff] & 0x00ff0000U) ^
+           (Te1[(s0 >> 24)] & 0xff000000U) ^
+           rk[1];
+       *(u32*)(out + 8) =
+           (Te2[(s2) & 0xff] & 0x000000ffU) ^
+           (Te3[(s3 >> 8) & 0xff] & 0x0000ff00U) ^
+           (Te0[(s0 >> 16) & 0xff] & 0x00ff0000U) ^
+           (Te1[(s1 >> 24)] & 0xff000000U) ^
+           rk[2];
+       *(u32*)(out + 12) =
+           (Te2[(s3) & 0xff] & 0x000000ffU) ^
+           (Te3[(s0 >> 8) & 0xff] & 0x0000ff00U) ^
+           (Te0[(s1 >> 16) & 0xff] & 0x00ff0000U) ^
+           (Te1[(s2 >> 24)] & 0xff000000U) ^
+           rk[3];
 #endif
 }
 
@@ -861,9 +879,9 @@ void AES_encrypt(const unsigned char *in, unsigned char *out,
  * Decrypt a single block
  * in and out can overlap
  */
-void AES_decrypt(const unsigned char *in, unsigned char *out,
-                const AES_KEY *key) {
-
+void
+AES_decrypt(const unsigned char *in, unsigned char *out, const AES_KEY *key)
+{
        const u32 *rk;
        u32 s0, s1, s2, s3, t[4];
        int r;
@@ -875,7 +893,7 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
         * map byte array block to cipher state
         * and add initial round key:
         */
-       s0 = GETU32(in     ) ^ rk[0];
+       s0 = GETU32(in) ^ rk[0];
        s1 = GETU32(in +  4) ^ rk[1];
        s2 = GETU32(in +  8) ^ rk[2];
        s3 = GETU32(in + 12) ^ rk[3];
@@ -883,181 +901,188 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
 #if defined(AES_COMPACT_IN_OUTER_ROUNDS)
        prefetch256(Td4);
 
-        t[0] = Td4[(s0      ) & 0xff]       ^
-               Td4[(s3 >>  8) & 0xff] <<  8 ^
-               Td4[(s2 >> 16) & 0xff] << 16 ^
-               Td4[(s1 >> 24)       ] << 24;
-        t[1] = Td4[(s1      ) & 0xff]       ^
-               Td4[(s0 >>  8) & 0xff] <<  8 ^
-               Td4[(s3 >> 16) & 0xff] << 16 ^
-               Td4[(s2 >> 24)       ] << 24;
-        t[2] = Td4[(s2      ) & 0xff]       ^
-               Td4[(s1 >>  8) & 0xff] <<  8 ^
-               Td4[(s0 >> 16) & 0xff] << 16 ^
-               Td4[(s3 >> 24)       ] << 24;
-        t[3] = Td4[(s3      ) & 0xff]       ^
-               Td4[(s2 >>  8) & 0xff] <<  8 ^
-               Td4[(s1 >> 16) & 0xff] << 16 ^
-               Td4[(s0 >> 24)       ] << 24;
+       t[0] = Td4[(s0) & 0xff] ^
+           Td4[(s3 >> 8) & 0xff] << 8 ^
+           Td4[(s2 >> 16) & 0xff] << 16 ^
+           Td4[(s1 >> 24)] << 24;
+       t[1] = Td4[(s1) & 0xff] ^
+           Td4[(s0 >> 8) & 0xff] << 8 ^
+           Td4[(s3 >> 16) & 0xff] << 16 ^
+           Td4[(s2 >> 24)] << 24;
+       t[2] = Td4[(s2) & 0xff] ^
+           Td4[(s1 >> 8) & 0xff] << 8 ^
+           Td4[(s0 >> 16) & 0xff] << 16 ^
+           Td4[(s3 >> 24)] << 24;
+       t[3] = Td4[(s3) & 0xff] ^
+           Td4[(s2 >> 8) & 0xff] << 8 ^
+           Td4[(s1 >> 16) & 0xff] << 16 ^
+           Td4[(s0 >> 24)] << 24;
 
-       /* now do the linear transform using words */ 
-       {       int i;
+       /* now do the linear transform using words */
+       {
+               int i;
                u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
 
                for (i = 0; i < 4; i++) {
                        tp1 = t[i];
                        m = tp1 & 0x80808080;
                        tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp2 & 0x80808080;
                        tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        m = tp4 & 0x80808080;
                        tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
+                           ((m - (m >> 7)) & 0x1b1b1b1b);
                        tp9 = tp8 ^ tp1;
                        tpb = tp9 ^ tp2;
                        tpd = tp9 ^ tp4;
                        tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-                       t[i] = tpe ^ ROTATE(tpd,16) ^
-                               ROTATE(tp9,8) ^ ROTATE(tpb,24);
+                       t[i] = tpe ^ ROTATE(tpd, 16) ^
+                           ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-                       t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-                               (tp9 >> 24) ^ (tp9 << 8) ^
-                               (tpb >> 8) ^ (tpb << 24);
+                       t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
+                           (tp9 >> 24) ^ (tp9 << 8) ^ (tpb >> 8) ^ (tpb << 24);
 #endif
-                       t[i] ^= rk[4+i];
+                       t[i] ^= rk[4 + i];
                }
        }
 #else
-       t[0] =  Td0[(s0      ) & 0xff] ^
-               Td1[(s3 >>  8) & 0xff] ^
-               Td2[(s2 >> 16) & 0xff] ^
-               Td3[(s1 >> 24)       ] ^
-               rk[4];
-       t[1] =  Td0[(s1      ) & 0xff] ^
-               Td1[(s0 >>  8) & 0xff] ^
-               Td2[(s3 >> 16) & 0xff] ^
-               Td3[(s2 >> 24)       ] ^
-               rk[5];
-       t[2] =  Td0[(s2      ) & 0xff] ^
-               Td1[(s1 >>  8) & 0xff] ^
-               Td2[(s0 >> 16) & 0xff] ^
-               Td3[(s3 >> 24)       ] ^
-               rk[6];
-       t[3] =  Td0[(s3      ) & 0xff] ^
-               Td1[(s2 >>  8) & 0xff] ^
-               Td2[(s1 >> 16) & 0xff] ^
-               Td3[(s0 >> 24)       ] ^
-               rk[7];
+       t[0] = Td0[(s0) & 0xff] ^
+           Td1[(s3 >> 8) & 0xff] ^
+           Td2[(s2 >> 16) & 0xff] ^
+           Td3[(s1 >> 24)] ^
+           rk[4];
+       t[1] = Td0[(s1) & 0xff] ^
+           Td1[(s0 >> 8) & 0xff] ^
+           Td2[(s3 >> 16) & 0xff] ^
+           Td3[(s2 >> 24)] ^
+           rk[5];
+       t[2] = Td0[(s2) & 0xff] ^
+           Td1[(s1 >> 8) & 0xff] ^
+           Td2[(s0 >> 16) & 0xff] ^
+           Td3[(s3 >> 24)] ^
+           rk[6];
+       t[3] = Td0[(s3) & 0xff] ^
+           Td1[(s2 >> 8) & 0xff] ^
+           Td2[(s1 >> 16) & 0xff] ^
+           Td3[(s0 >> 24)] ^
+           rk[7];
 #endif
-       s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
+       s0 = t[0];
+       s1 = t[1];
+       s2 = t[2];
+       s3 = t[3];
 
     /*
      * Nr - 2 full rounds:
      */
-    for (rk+=8,r=key->rounds-2; r>0; rk+=4,r--) {
+       for (rk += 8, r = key->rounds - 2; r > 0; rk += 4, r--) {
 #if defined(AES_COMPACT_IN_INNER_ROUNDS)
-        t[0] = Td4[(s0      ) & 0xff]       ^
-               Td4[(s3 >>  8) & 0xff] <<  8 ^
-               Td4[(s2 >> 16) & 0xff] << 16 ^
-               Td4[(s1 >> 24)       ] << 24;
-        t[1] = Td4[(s1      ) & 0xff]       ^
-               Td4[(s0 >>  8) & 0xff] <<  8 ^
-               Td4[(s3 >> 16) & 0xff] << 16 ^
-               Td4[(s2 >> 24)       ] << 24;
-        t[2] = Td4[(s2      ) & 0xff]       ^
-               Td4[(s1 >>  8) & 0xff] <<  8 ^
-               Td4[(s0 >> 16) & 0xff] << 16 ^
-               Td4[(s3 >> 24)       ] << 24;
-        t[3] = Td4[(s3      ) & 0xff]       ^
-               Td4[(s2 >>  8) & 0xff] <<  8 ^
-               Td4[(s1 >> 16) & 0xff] << 16 ^
-               Td4[(s0 >> 24)       ] << 24;
+               t[0] = Td4[(s0) & 0xff] ^
+                   Td4[(s3 >> 8) & 0xff] << 8 ^
+                   Td4[(s2 >> 16) & 0xff] << 16 ^
+                   Td4[(s1 >> 24)] << 24;
+               t[1] = Td4[(s1) & 0xff] ^
+                   Td4[(s0 >> 8) & 0xff] << 8 ^
+                   Td4[(s3 >> 16) & 0xff] << 16 ^
+                   Td4[(s2 >> 24)] << 24;
+               t[2] = Td4[(s2) & 0xff] ^
+                   Td4[(s1 >> 8) & 0xff] << 8 ^
+                   Td4[(s0 >> 16) & 0xff] << 16 ^
+                   Td4[(s3 >> 24)] << 24;
+               t[3] = Td4[(s3) & 0xff] ^
+                   Td4[(s2 >> 8) & 0xff] << 8 ^
+                   Td4[(s1 >> 16) & 0xff] << 16 ^
+                   Td4[(s0 >> 24)] << 24;
 
-       /* now do the linear transform using words */ 
-       {       int i;
-               u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
+               /* now do the linear transform using words */
+               {
+                       int i;
+                       u32 tp1, tp2, tp4, tp8, tp9, tpb, tpd, tpe, m;
 
-               for (i = 0; i < 4; i++) {
-                       tp1 = t[i];
-                       m = tp1 & 0x80808080;
-                       tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
-                       m = tp2 & 0x80808080;
-                       tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
-                       m = tp4 & 0x80808080;
-                       tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
-                               ((m - (m >> 7)) & 0x1b1b1b1b);
-                       tp9 = tp8 ^ tp1;
-                       tpb = tp9 ^ tp2;
-                       tpd = tp9 ^ tp4;
-                       tpe = tp8 ^ tp4 ^ tp2;
+                       for (i = 0; i < 4; i++) {
+                               tp1 = t[i];
+                               m = tp1 & 0x80808080;
+                               tp2 = ((tp1 & 0x7f7f7f7f) << 1) ^
+                                   ((m - (m >> 7)) & 0x1b1b1b1b);
+                               m = tp2 & 0x80808080;
+                               tp4 = ((tp2 & 0x7f7f7f7f) << 1) ^
+                                   ((m - (m >> 7)) & 0x1b1b1b1b);
+                               m = tp4 & 0x80808080;
+                                   tp8 = ((tp4 & 0x7f7f7f7f) << 1) ^
+                                   ((m - (m >> 7)) & 0x1b1b1b1b);
+                               tp9 = tp8 ^ tp1;
+                               tpb = tp9 ^ tp2;
+                               tpd = tp9 ^ tp4;
+                               tpe = tp8 ^ tp4 ^ tp2;
 #if defined(ROTATE)
-                       t[i] = tpe ^ ROTATE(tpd,16) ^
-                               ROTATE(tp9,8) ^ ROTATE(tpb,24);
+                               t[i] = tpe ^ ROTATE(tpd, 16) ^
+                                   ROTATE(tp9, 8) ^ ROTATE(tpb, 24);
 #else
-                       t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^ 
-                               (tp9 >> 24) ^ (tp9 << 8) ^
-                               (tpb >> 8) ^ (tpb << 24);
+                               t[i] = tpe ^ (tpd >> 16) ^ (tpd << 16) ^
+                                   (tp9 >> 24) ^ (tp9 << 8) ^
+                                   (tpb >> 8) ^ (tpb << 24);
 #endif
-                       t[i] ^= rk[i];
+                               t[i] ^= rk[i];
+                       }
                }
-       }
 #else
-       t[0] =  Td0[(s0      ) & 0xff] ^
-               Td1[(s3 >>  8) & 0xff] ^
-               Td2[(s2 >> 16) & 0xff] ^
-               Td3[(s1 >> 24)       ] ^
-               rk[0];
-       t[1] =  Td0[(s1      ) & 0xff] ^
-               Td1[(s0 >>  8) & 0xff] ^
-               Td2[(s3 >> 16) & 0xff] ^
-               Td3[(s2 >> 24)       ] ^
-               rk[1];
-       t[2] =  Td0[(s2      ) & 0xff] ^
-               Td1[(s1 >>  8) & 0xff] ^
-               Td2[(s0 >> 16) & 0xff] ^
-               Td3[(s3 >> 24)       ] ^
-               rk[2];
-       t[3] =  Td0[(s3      ) & 0xff] ^
-               Td1[(s2 >>  8) & 0xff] ^
-               Td2[(s1 >> 16) & 0xff] ^
-               Td3[(s0 >> 24)       ] ^
-               rk[3];
+               t[0] = Td0[(s0) & 0xff] ^
+                   Td1[(s3 >> 8) & 0xff] ^
+                   Td2[(s2 >> 16) & 0xff] ^
+                   Td3[(s1 >> 24)] ^
+                   rk[0];
+               t[1] = Td0[(s1) & 0xff] ^
+                   Td1[(s0 >>  8) & 0xff] ^
+                   Td2[(s3 >> 16) & 0xff] ^
+                   Td3[(s2 >> 24)] ^
+                   rk[1];
+               t[2] = Td0[(s2) & 0xff] ^
+                   Td1[(s1 >> 8) & 0xff] ^
+                   Td2[(s0 >> 16) & 0xff] ^
+                   Td3[(s3 >> 24)] ^
+                   rk[2];
+               t[3] = Td0[(s3) & 0xff] ^
+                   Td1[(s2 >> 8) & 0xff] ^
+                   Td2[(s1 >> 16) & 0xff] ^
+                   Td3[(s0 >> 24)] ^
+                   rk[3];
 #endif
-       s0 = t[0]; s1 = t[1]; s2 = t[2]; s3 = t[3];
-    }
-    /*
+               s0 = t[0];
+               s1 = t[1];
+               s2 = t[2];
+               s3 = t[3];
+       }
+       /*
         * apply last round and
         * map cipher state to byte array block:
         */
        prefetch256(Td4);
 
-       *(u32*)(out+0) =
-               (Td4[(s0      ) & 0xff])        ^
-               (Td4[(s3 >>  8) & 0xff] <<  8) ^
-               (Td4[(s2 >> 16) & 0xff] << 16) ^
-               (Td4[(s1 >> 24)       ] << 24) ^
-               rk[0];
-       *(u32*)(out+4) =
-               (Td4[(s1      ) & 0xff])         ^
-               (Td4[(s0 >>  8) & 0xff] <<  8) ^
-               (Td4[(s3 >> 16) & 0xff] << 16) ^
-               (Td4[(s2 >> 24)       ] << 24) ^
-               rk[1];
-       *(u32*)(out+8) =
-               (Td4[(s2      ) & 0xff])         ^
-               (Td4[(s1 >>  8) & 0xff] <<  8) ^
-               (Td4[(s0 >> 16) & 0xff] << 16) ^
-               (Td4[(s3 >> 24)       ] << 24) ^
-               rk[2];
-       *(u32*)(out+12) =
-               (Td4[(s3      ) & 0xff])         ^
-               (Td4[(s2 >>  8) & 0xff] <<  8) ^
-               (Td4[(s1 >> 16) & 0xff] << 16) ^
-               (Td4[(s0 >> 24)       ] << 24) ^
-               rk[3];
+       *(u32*)(out + 0) =
+           (Td4[(s0) & 0xff]) ^
+           (Td4[(s3 >> 8) & 0xff] << 8) ^
+           (Td4[(s2 >> 16) & 0xff] << 16) ^
+           (Td4[(s1 >> 24)] << 24) ^
+           rk[0];
+       *(u32*)(out + 4) =
+           (Td4[(s1) & 0xff]) ^
+           (Td4[(s0 >> 8) & 0xff] << 8) ^
+           (Td4[(s3 >> 16) & 0xff] << 16) ^
+           (Td4[(s2 >> 24)] << 24) ^
+           rk[1];
+       *(u32*)(out + 8) =
+           (Td4[(s2) & 0xff]) ^
+           (Td4[(s1 >>  8) & 0xff] << 8) ^
+           (Td4[(s0 >> 16) & 0xff] << 16) ^
+           (Td4[(s3 >> 24)] << 24) ^
+           rk[2];
+       *(u32*)(out + 12) =
+           (Td4[(s3) & 0xff]) ^
+           (Td4[(s2 >> 8) & 0xff] << 8) ^
+           (Td4[(s1 >> 16) & 0xff] << 16) ^
+           (Td4[(s0 >> 24)] << 24) ^
+           rk[3];
 }