summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog8
-rw-r--r--Build/source/texk/dvipdfm-x/dpxcrypt.c1608
-rw-r--r--Build/source/texk/dvipdfm-x/dpxcrypt.h62
-rw-r--r--Build/source/texk/dvipdfm-x/dvi.c31
-rw-r--r--Build/source/texk/dvipdfm-x/dvi.h9
-rw-r--r--Build/source/texk/dvipdfm-x/dvipdfmx.c50
-rw-r--r--Build/source/texk/dvipdfm-x/jpegimage.c62
-rw-r--r--Build/source/texk/dvipdfm-x/pdfencrypt.c994
-rw-r--r--Build/source/texk/dvipdfm-x/pdfencrypt.h8
-rw-r--r--Build/source/texk/dvipdfm-x/pdfobj.c40
-rw-r--r--Build/source/texk/dvipdfm-x/pngimage.c56
-rw-r--r--Build/source/texk/dvipdfm-x/unicode.c41
-rw-r--r--Build/source/texk/dvipdfm-x/unicode.h4
13 files changed, 2491 insertions, 482 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 8d85551c347..ac980767bcc 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,11 @@
+2015-07-04 Shunsaku Hirata <shunsaku.hirata74@gmail.com>
+
+ * jpegimage.c: Use size_t, uint32_t,... instead of short/long int.
+ * dpxcrypt.c/h, dvi.c/h, pdfencrypt.c/h, dvipdfmx.c, pdfobj.c:
+ Add AES encryption support in PDF ecryption.
+ * pngimage.c : Support images with 16 bit depth.
+ * unicode.c/h: Add UTF-8 decoding function.
+
2015-05-23 Jiang Jiang <gzjjgod@gmail.com>
* dvi.c: Fix Type1 font encoding and metrics.
diff --git a/Build/source/texk/dvipdfm-x/dpxcrypt.c b/Build/source/texk/dvipdfm-x/dpxcrypt.c
index 3f972205520..b1838e744bc 100644
--- a/Build/source/texk/dvipdfm-x/dpxcrypt.c
+++ b/Build/source/texk/dvipdfm-x/dpxcrypt.c
@@ -26,7 +26,11 @@
# include <sys/types.h>
#endif
#include <string.h>
+#include <stdlib.h>
+#include "mem.h"
+#include "error.h"
+#include "numbers.h"
#include "dpxcrypt.h"
static void _gcry_burn_stack (int bytes)
@@ -38,8 +42,10 @@ static void _gcry_burn_stack (int bytes)
if (bytes > 0) _gcry_burn_stack(bytes);
}
+
/* Rotate a 32 bit integer by n bytes */
#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
+#define ror(x,n) ( ((x) >> ((n)&(32-1))) | ((x) << ((32-(n))&(32-1))) )
/*
* The following codes for MD5 Message-Digest Algorithm were modified
@@ -69,10 +75,10 @@ static void _gcry_burn_stack (int bytes)
void MD5_init (MD5_CONTEXT *ctx)
{
- ctx->A = 0x67452301;
- ctx->B = 0xefcdab89;
- ctx->C = 0x98badcfe;
- ctx->D = 0x10325476;
+ ctx->A = 0x67452301U;
+ ctx->B = 0xefcdab89U;
+ ctx->C = 0x98badcfeU;
+ ctx->D = 0x10325476U;
ctx->nblocks = 0;
ctx->count = 0;
@@ -91,10 +97,10 @@ void MD5_init (MD5_CONTEXT *ctx)
static void transform (MD5_CONTEXT *ctx, const unsigned char *data)
{
uint32_t correct_words[16];
- register uint32_t A = ctx->A;
- register uint32_t B = ctx->B;
- register uint32_t C = ctx->C;
- register uint32_t D = ctx->D;
+ uint32_t A = ctx->A;
+ uint32_t B = ctx->B;
+ uint32_t C = ctx->C;
+ uint32_t D = ctx->D;
uint32_t *cwp = correct_words;
#ifdef WORDS_BIGENDIAN
@@ -237,7 +243,7 @@ void MD5_write (MD5_CONTEXT *hd, const unsigned char *inbuf, unsigned long inlen
void MD5_final (unsigned char *outbuf, MD5_CONTEXT *hd)
{
- unsigned long t, msb, lsb;
+ uint32_t t, msb, lsb;
unsigned char *p;
MD5_write(hd, NULL, 0); /* flush */
@@ -291,6 +297,822 @@ void MD5_final (unsigned char *outbuf, MD5_CONTEXT *hd)
}
/*
+ * The following codes for the SHA256 hash function are taken from
+ * libgrypt-1.6.3. (slightly modified)
+ *
+ * sha256.c - SHA256 hash function
+ * Copyright (C) 2003, 2006, 2008, 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+static u32
+_gcry_bswap32(u32 x)
+{
+ return ((rol(x, 8) & 0x00ff00ffL) | (ror(x, 8) & 0xff00ff00L));
+}
+
+static u64
+_gcry_bswap64(u64 x)
+{
+ return ((u64)_gcry_bswap32(x) << 32) | (_gcry_bswap32(x >> 32));
+}
+
+/* Endian dependent byte swap operations. */
+#ifdef WORDS_BIGENDIAN
+# define le_bswap32(x) _gcry_bswap32(x)
+# define be_bswap32(x) ((u32)(x))
+# define le_bswap64(x) _gcry_bswap64(x)
+# define be_bswap64(x) ((u64)(x))
+#else
+# define le_bswap32(x) ((u32)(x))
+# define be_bswap32(x) _gcry_bswap32(x)
+# define le_bswap64(x) ((u64)(x))
+# define be_bswap64(x) _gcry_bswap64(x)
+#endif
+
+static u32 buf_get_be32(const void *_buf)
+{
+ const byte *in = _buf;
+ return ((u32)in[0] << 24) | ((u32)in[1] << 16) | \
+ ((u32)in[2] << 8) | (u32)in[3];
+}
+
+static void buf_put_be32(void *_buf, u32 val)
+{
+ byte *out = _buf;
+ out[0] = val >> 24;
+ out[1] = val >> 16;
+ out[2] = val >> 8;
+ out[3] = val;
+}
+
+static u64 buf_get_be64(const void *_buf)
+{
+ const byte *in = _buf;
+ return ((u64)in[0] << 56) | ((u64)in[1] << 48) | \
+ ((u64)in[2] << 40) | ((u64)in[3] << 32) | \
+ ((u64)in[4] << 24) | ((u64)in[5] << 16) | \
+ ((u64)in[6] << 8) | (u64)in[7];
+}
+
+static void buf_put_be64(void *_buf, u64 val)
+{
+ byte *out = _buf;
+ out[0] = val >> 56;
+ out[1] = val >> 48;
+ out[2] = val >> 40;
+ out[3] = val >> 32;
+ out[4] = val >> 24;
+ out[5] = val >> 16;
+ out[6] = val >> 8;
+ out[7] = val;
+}
+
+void
+SHA256_init (SHA256_CONTEXT *hd)
+{
+ hd->h0 = 0x6a09e667;
+ hd->h1 = 0xbb67ae85;
+ hd->h2 = 0x3c6ef372;
+ hd->h3 = 0xa54ff53a;
+ hd->h4 = 0x510e527f;
+ hd->h5 = 0x9b05688c;
+ hd->h6 = 0x1f83d9ab;
+ hd->h7 = 0x5be0cd19;
+
+ hd->nblocks = 0;
+ hd->count = 0;
+}
+
+/*
+ Transform the message X which consists of 16 32-bit-words. See FIPS
+ 180-2 for details. */
+#define S0(x) (ror ((x), 7) ^ ror ((x), 18) ^ ((x) >> 3)) /* (4.6) */
+#define S1(x) (ror ((x), 17) ^ ror ((x), 19) ^ ((x) >> 10)) /* (4.7) */
+#define R(a,b,c,d,e,f,g,h,k,w) do \
+ { \
+ t1 = (h) + Sum1((e)) + Cho((e),(f),(g)) + (k) + (w); \
+ t2 = Sum0((a)) + Maj((a),(b),(c)); \
+ h = g; \
+ g = f; \
+ f = e; \
+ e = d + t1; \
+ d = c; \
+ c = b; \
+ b = a; \
+ a = t1 + t2; \
+ } while (0)
+
+
+#define Cho(x,y,z) ((z) ^ ((x) & ((y) ^ (z))))
+#define Maj(x,y,z) (((x) & (y)) | ((z) & ((x)|(y))))
+#define Sum0(x) (ror((x), 2) ^ ror((x), 13) ^ ror((x), 22))
+#define Sum1(x) (ror((x), 6) ^ ror((x), 11) ^ ror((x), 25))
+
+static unsigned int
+_SHA256_transform (SHA256_CONTEXT *hd, const unsigned char *data)
+{
+ static const u32 K[64] = {
+ 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
+ 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+ 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
+ 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+ 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
+ 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+ 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
+ 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+ 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
+ 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+ 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
+ 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+ 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
+ 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+ 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
+ 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+ };
+
+ u32 a,b,c,d,e,f,g,h,t1,t2;
+ u32 w[64];
+ int i;
+
+ a = hd->h0;
+ b = hd->h1;
+ c = hd->h2;
+ d = hd->h3;
+ e = hd->h4;
+ f = hd->h5;
+ g = hd->h6;
+ h = hd->h7;
+
+ for (i=0; i < 16; i++)
+ w[i] = buf_get_be32(data + i * 4);
+ for (; i < 64; i++)
+ w[i] = S1(w[i-2]) + w[i-7] + S0(w[i-15]) + w[i-16];
+
+ for (i=0; i < 64;)
+ {
+#if 0
+ R(a,b,c,d,e,f,g,h,K[i],w[i]);
+ i++;
+#else
+ t1 = h + Sum1 (e) + Cho (e, f, g) + K[i] + w[i];
+ t2 = Sum0 (a) + Maj (a, b, c);
+ d += t1;
+ h = t1 + t2;
+
+ t1 = g + Sum1 (d) + Cho (d, e, f) + K[i+1] + w[i+1];
+ t2 = Sum0 (h) + Maj (h, a, b);
+ c += t1;
+ g = t1 + t2;
+
+ t1 = f + Sum1 (c) + Cho (c, d, e) + K[i+2] + w[i+2];
+ t2 = Sum0 (g) + Maj (g, h, a);
+ b += t1;
+ f = t1 + t2;
+
+ t1 = e + Sum1 (b) + Cho (b, c, d) + K[i+3] + w[i+3];
+ t2 = Sum0 (f) + Maj (f, g, h);
+ a += t1;
+ e = t1 + t2;
+
+ t1 = d + Sum1 (a) + Cho (a, b, c) + K[i+4] + w[i+4];
+ t2 = Sum0 (e) + Maj (e, f, g);
+ h += t1;
+ d = t1 + t2;
+
+ t1 = c + Sum1 (h) + Cho (h, a, b) + K[i+5] + w[i+5];
+ t2 = Sum0 (d) + Maj (d, e, f);
+ g += t1;
+ c = t1 + t2;
+
+ t1 = b + Sum1 (g) + Cho (g, h, a) + K[i+6] + w[i+6];
+ t2 = Sum0 (c) + Maj (c, d, e);
+ f += t1;
+ b = t1 + t2;
+
+ t1 = a + Sum1 (f) + Cho (f, g, h) + K[i+7] + w[i+7];
+ t2 = Sum0 (b) + Maj (b, c, d);
+ e += t1;
+ a = t1 + t2;
+
+ i += 8;
+#endif
+ }
+
+ hd->h0 += a;
+ hd->h1 += b;
+ hd->h2 += c;
+ hd->h3 += d;
+ hd->h4 += e;
+ hd->h5 += f;
+ hd->h6 += g;
+ hd->h7 += h;
+
+ return /*burn_stack*/ 74*4+32;
+}
+#undef S0
+#undef S1
+#undef R
+
+void SHA256_write (SHA256_CONTEXT *hd, const unsigned char *inbuf, unsigned long inlen)
+{
+ unsigned int stack_burn = 0;
+
+ if (hd->count == 64) { /* flush the buffer */
+ stack_burn = _SHA256_transform(hd, hd->buf);
+ _gcry_burn_stack(stack_burn);
+ hd->count = 0;
+ hd->nblocks++;
+ }
+ if (!inbuf) return;
+ if (hd->count) {
+ for (; inlen && hd->count < 64; inlen--)
+ hd->buf[hd->count++] = *inbuf++;
+ SHA256_write(hd, NULL, 0);
+ if (!inlen) return;
+ }
+ _gcry_burn_stack(stack_burn);
+
+ while (inlen >= 64) {
+ stack_burn = _SHA256_transform(hd, inbuf);
+ hd->count = 0;
+ hd->nblocks++;
+ inlen -= 64;
+ inbuf += 64;
+ }
+ for (; inlen && hd->count < 64; inlen--)
+ hd->buf[hd->count++] = *inbuf++;
+}
+
+/*
+ The routine finally terminates the computation and returns the
+ digest. The handle is prepared for a new cycle, but adding bytes
+ to the handle will the destroy the returned buffer. Returns: 32
+ bytes with the message the digest. */
+void
+SHA256_final(unsigned char *outbuf, SHA256_CONTEXT *hd)
+{
+ u32 t, msb, lsb;
+ unsigned char *p;
+ unsigned int burn;
+
+ SHA256_write(hd, NULL, 0); /* flush */;
+
+ t = hd->nblocks;
+
+ /* multiply by 64 to make a byte count */
+ lsb = t << 6;
+ msb = t >> 26;
+ /* add the count */
+ t = lsb;
+ if ((lsb += hd->count) < t)
+ msb++;
+ /* multiply by 8 to make a bit count */
+ t = lsb;
+ lsb <<= 3;
+ msb <<= 3;
+ msb |= t >> 29;
+
+ if (hd->count < 56)
+ { /* enough room */
+ hd->buf[hd->count++] = 0x80; /* pad */
+ while (hd->count < 56)
+ hd->buf[hd->count++] = 0; /* pad */
+ }
+ else
+ { /* need one extra block */
+ hd->buf[hd->count++] = 0x80; /* pad character */
+ while (hd->count < 64)
+ hd->buf[hd->count++] = 0;
+ SHA256_write(hd, NULL, 0); /* flush */;
+ memset (hd->buf, 0, 56 ); /* fill next block with zeroes */
+ }
+ /* append the 64 bit count */
+ buf_put_be32(hd->buf + 56, msb);
+ buf_put_be32(hd->buf + 60, lsb);
+ burn = _SHA256_transform(hd, hd->buf);
+ _gcry_burn_stack(burn);
+
+ p = outbuf;
+#define X(a) do { *(u32*)p = be_bswap32(hd->h##a); p += 4; } while(0)
+ X(0);
+ X(1);
+ X(2);
+ X(3);
+ X(4);
+ X(5);
+ X(6);
+ X(7);
+#undef X
+}
+
+#undef Cho
+#undef Maj
+#undef Sum0
+#undef Sum1
+
+/* The following code are taken from libgcrypt-1.6.3. (slightly modified):
+ *
+ * sha512.c - SHA384 and SHA512 hash functions
+ * Copyright (C) 2003, 2008, 2009 Free Software Foundation, Inc.
+ *
+ * This file is part of Libgcrypt.
+ *
+ * Libgcrypt is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser general Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * Libgcrypt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define ROTR(x,n) (((x) >> (n)) | ((x) << (64 - (n))))
+#define Ch(x,y,z) (((x) & (y)) ^ ( ~(x) & (z)))
+#define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+#define Sum0(x) (ROTR((x), 28) ^ ROTR((x), 34) ^ ROTR((x), 39))
+#define Sum1(x) (ROTR((x), 14) ^ ROTR((x), 18) ^ ROTR((x), 41))
+#define U64_C(c) (c ## UL)
+
+void
+SHA512_init (SHA512_CONTEXT *ctx)
+{
+ SHA512_STATE *hd = &ctx->state;
+
+ hd->h0 = U64_C(0x6a09e667f3bcc908);
+ hd->h1 = U64_C(0xbb67ae8584caa73b);
+ hd->h2 = U64_C(0x3c6ef372fe94f82b);
+ hd->h3 = U64_C(0xa54ff53a5f1d36f1);
+ hd->h4 = U64_C(0x510e527fade682d1);
+ hd->h5 = U64_C(0x9b05688c2b3e6c1f);
+ hd->h6 = U64_C(0x1f83d9abfb41bd6b);
+ hd->h7 = U64_C(0x5be0cd19137e2179);
+
+ ctx->nblocks = 0;
+ ctx->count = 0;
+}
+
+void
+SHA384_init (SHA512_CONTEXT *ctx)
+{
+ SHA512_STATE *hd = &ctx->state;
+
+ hd->h0 = U64_C(0xcbbb9d5dc1059ed8);
+ hd->h1 = U64_C(0x629a292a367cd507);
+ hd->h2 = U64_C(0x9159015a3070dd17);
+ hd->h3 = U64_C(0x152fecd8f70e5939);
+ hd->h4 = U64_C(0x67332667ffc00b31);
+ hd->h5 = U64_C(0x8eb44a8768581511);
+ hd->h6 = U64_C(0xdb0c2e0d64f98fa7);
+ hd->h7 = U64_C(0x47b5481dbefa4fa4);
+
+ ctx->nblocks = 0;
+ ctx->count = 0;
+}
+
+
+static const u64 k[] =
+ {
+ U64_C(0x428a2f98d728ae22), U64_C(0x7137449123ef65cd),
+ U64_C(0xb5c0fbcfec4d3b2f), U64_C(0xe9b5dba58189dbbc),
+ U64_C(0x3956c25bf348b538), U64_C(0x59f111f1b605d019),
+ U64_C(0x923f82a4af194f9b), U64_C(0xab1c5ed5da6d8118),
+ U64_C(0xd807aa98a3030242), U64_C(0x12835b0145706fbe),
+ U64_C(0x243185be4ee4b28c), U64_C(0x550c7dc3d5ffb4e2),
+ U64_C(0x72be5d74f27b896f), U64_C(0x80deb1fe3b1696b1),
+ U64_C(0x9bdc06a725c71235), U64_C(0xc19bf174cf692694),
+ U64_C(0xe49b69c19ef14ad2), U64_C(0xefbe4786384f25e3),
+ U64_C(0x0fc19dc68b8cd5b5), U64_C(0x240ca1cc77ac9c65),
+ U64_C(0x2de92c6f592b0275), U64_C(0x4a7484aa6ea6e483),
+ U64_C(0x5cb0a9dcbd41fbd4), U64_C(0x76f988da831153b5),
+ U64_C(0x983e5152ee66dfab), U64_C(0xa831c66d2db43210),
+ U64_C(0xb00327c898fb213f), U64_C(0xbf597fc7beef0ee4),
+ U64_C(0xc6e00bf33da88fc2), U64_C(0xd5a79147930aa725),
+ U64_C(0x06ca6351e003826f), U64_C(0x142929670a0e6e70),
+ U64_C(0x27b70a8546d22ffc), U64_C(0x2e1b21385c26c926),
+ U64_C(0x4d2c6dfc5ac42aed), U64_C(0x53380d139d95b3df),
+ U64_C(0x650a73548baf63de), U64_C(0x766a0abb3c77b2a8),
+ U64_C(0x81c2c92e47edaee6), U64_C(0x92722c851482353b),
+ U64_C(0xa2bfe8a14cf10364), U64_C(0xa81a664bbc423001),
+ U64_C(0xc24b8b70d0f89791), U64_C(0xc76c51a30654be30),
+ U64_C(0xd192e819d6ef5218), U64_C(0xd69906245565a910),
+ U64_C(0xf40e35855771202a), U64_C(0x106aa07032bbd1b8),
+ U64_C(0x19a4c116b8d2d0c8), U64_C(0x1e376c085141ab53),
+ U64_C(0x2748774cdf8eeb99), U64_C(0x34b0bcb5e19b48a8),
+ U64_C(0x391c0cb3c5c95a63), U64_C(0x4ed8aa4ae3418acb),
+ U64_C(0x5b9cca4f7763e373), U64_C(0x682e6ff3d6b2b8a3),
+ U64_C(0x748f82ee5defb2fc), U64_C(0x78a5636f43172f60),
+ U64_C(0x84c87814a1f0ab72), U64_C(0x8cc702081a6439ec),
+ U64_C(0x90befffa23631e28), U64_C(0xa4506cebde82bde9),
+ U64_C(0xbef9a3f7b2c67915), U64_C(0xc67178f2e372532b),
+ U64_C(0xca273eceea26619c), U64_C(0xd186b8c721c0c207),
+ U64_C(0xeada7dd6cde0eb1e), U64_C(0xf57d4f7fee6ed178),
+ U64_C(0x06f067aa72176fba), U64_C(0x0a637dc5a2c898a6),
+ U64_C(0x113f9804bef90dae), U64_C(0x1b710b35131c471b),
+ U64_C(0x28db77f523047d84), U64_C(0x32caab7b40c72493),
+ U64_C(0x3c9ebe0a15c9bebc), U64_C(0x431d67c49c100d4c),
+ U64_C(0x4cc5d4becb3e42b6), U64_C(0x597f299cfc657e2a),
+ U64_C(0x5fcb6fab3ad6faec), U64_C(0x6c44198c4a475817)
+ };
+
+/****************
+ * Transform the message W which consists of 16 64-bit-words
+ */
+static unsigned int
+__transform (SHA512_STATE *hd, const unsigned char *data)
+{
+ u64 a, b, c, d, e, f, g, h;
+ u64 w[16];
+ int t;
+
+ /* get values from the chaining vars */
+ a = hd->h0;
+ b = hd->h1;
+ c = hd->h2;
+ d = hd->h3;
+ e = hd->h4;
+ f = hd->h5;
+ g = hd->h6;
+ h = hd->h7;
+
+ for ( t = 0; t < 16; t++ )
+ w[t] = buf_get_be64(data + t * 8);
+
+#define S0(x) (ROTR((x),1) ^ ROTR((x),8) ^ ((x)>>7))
+#define S1(x) (ROTR((x),19) ^ ROTR((x),61) ^ ((x)>>6))
+
+
+ for (t = 0; t < 80 - 16; )
+ {
+ u64 t1, t2;
+
+ /* Performance on a AMD Athlon(tm) Dual Core Processor 4050e
+ with gcc 4.3.3 using gcry_md_hash_buffer of each 10000 bytes
+ initialized to 0,1,2,3...255,0,... and 1000 iterations:
+
+ Not unrolled with macros: 440ms
+ Unrolled with macros: 350ms
+ Unrolled with inline: 330ms
+ */
+#if 0 /* Not unrolled. */
+ t1 = h + Sum1 (e) + Ch (e, f, g) + k[t] + w[t%16];
+ w[t%16] += S1 (w[(t - 2)%16]) + w[(t - 7)%16] + S0 (w[(t - 15)%16]);
+ t2 = Sum0 (a) + Maj (a, b, c);
+ h = g;
+ g = f;
+ f = e;
+ e = d + t1;
+ d = c;
+ c = b;
+ b = a;
+ a = t1 + t2;
+ t++;
+#else /* Unrolled to interweave the chain variables. */
+ t1 = h + Sum1 (e) + Ch (e, f, g) + k[t] + w[0];
+ w[0] += S1 (w[14]) + w[9] + S0 (w[1]);
+ t2 = Sum0 (a) + Maj (a, b, c);
+ d += t1;
+ h = t1 + t2;
+
+ t1 = g + Sum1 (d) + Ch (d, e, f) + k[t+1] + w[1];
+ w[1] += S1 (w[15]) + w[10] + S0 (w[2]);
+ t2 = Sum0 (h) + Maj (h, a, b);
+ c += t1;
+ g = t1 + t2;
+
+ t1 = f + Sum1 (c) + Ch (c, d, e) + k[t+2] + w[2];
+ w[2] += S1 (w[0]) + w[11] + S0 (w[3]);
+ t2 = Sum0 (g) + Maj (g, h, a);
+ b += t1;
+ f = t1 + t2;
+
+ t1 = e + Sum1 (b) + Ch (b, c, d) + k[t+3] + w[3];
+ w[3] += S1 (w[1]) + w[12] + S0 (w[4]);
+ t2 = Sum0 (f) + Maj (f, g, h);
+ a += t1;
+ e = t1 + t2;
+
+ t1 = d + Sum1 (a) + Ch (a, b, c) + k[t+4] + w[4];
+ w[4] += S1 (w[2]) + w[13] + S0 (w[5]);
+ t2 = Sum0 (e) + Maj (e, f, g);
+ h += t1;
+ d = t1 + t2;
+
+ t1 = c + Sum1 (h) + Ch (h, a, b) + k[t+5] + w[5];
+ w[5] += S1 (w[3]) + w[14] + S0 (w[6]);
+ t2 = Sum0 (d) + Maj (d, e, f);
+ g += t1;
+ c = t1 + t2;
+
+ t1 = b + Sum1 (g) + Ch (g, h, a) + k[t+6] + w[6];
+ w[6] += S1 (w[4]) + w[15] + S0 (w[7]);
+ t2 = Sum0 (c) + Maj (c, d, e);
+ f += t1;
+ b = t1 + t2;
+
+ t1 = a + Sum1 (f) + Ch (f, g, h) + k[t+7] + w[7];
+ w[7] += S1 (w[5]) + w[0] + S0 (w[8]);
+ t2 = Sum0 (b) + Maj (b, c, d);
+ e += t1;
+ a = t1 + t2;
+
+ t1 = h + Sum1 (e) + Ch (e, f, g) + k[t+8] + w[8];
+ w[8] += S1 (w[6]) + w[1] + S0 (w[9]);
+ t2 = Sum0 (a) + Maj (a, b, c);
+ d += t1;
+ h = t1 + t2;
+
+ t1 = g + Sum1 (d) + Ch (d, e, f) + k[t+9] + w[9];
+ w[9] += S1 (w[7]) + w[2] + S0 (w[10]);
+ t2 = Sum0 (h) + Maj (h, a, b);
+ c += t1;
+ g = t1 + t2;
+
+ t1 = f + Sum1 (c) + Ch (c, d, e) + k[t+10] + w[10];
+ w[10] += S1 (w[8]) + w[3] + S0 (w[11]);
+ t2 = Sum0 (g) + Maj (g, h, a);
+ b += t1;
+ f = t1 + t2;
+
+ t1 = e + Sum1 (b) + Ch (b, c, d) + k[t+11] + w[11];
+ w[11] += S1 (w[9]) + w[4] + S0 (w[12]);
+ t2 = Sum0 (f) + Maj (f, g, h);
+ a += t1;
+ e = t1 + t2;
+
+ t1 = d + Sum1 (a) + Ch (a, b, c) + k[t+12] + w[12];
+ w[12] += S1 (w[10]) + w[5] + S0 (w[13]);
+ t2 = Sum0 (e) + Maj (e, f, g);
+ h += t1;
+ d = t1 + t2;
+
+ t1 = c + Sum1 (h) + Ch (h, a, b) + k[t+13] + w[13];
+ w[13] += S1 (w[11]) + w[6] + S0 (w[14]);
+ t2 = Sum0 (d) + Maj (d, e, f);
+ g += t1;
+ c = t1 + t2;
+
+ t1 = b + Sum1 (g) + Ch (g, h, a) + k[t+14] + w[14];
+ w[14] += S1 (w[12]) + w[7] + S0 (w[15]);
+ t2 = Sum0 (c) + Maj (c, d, e);
+ f += t1;
+ b = t1 + t2;
+
+ t1 = a + Sum1 (f) + Ch (f, g, h) + k[t+15] + w[15];
+ w[15] += S1 (w[13]) + w[8] + S0 (w[0]);
+ t2 = Sum0 (b) + Maj (b, c, d);
+ e += t1;
+ a = t1 + t2;
+
+ t += 16;
+#endif
+ }
+
+ for (; t < 80; )
+ {
+ u64 t1, t2;
+
+#if 0 /* Not unrolled. */
+ t1 = h + Sum1 (e) + Ch (e, f, g) + k[t] + w[t%16];
+ t2 = Sum0 (a) + Maj (a, b, c);
+ h = g;
+ g = f;
+ f = e;
+ e = d + t1;
+ d = c;
+ c = b;
+ b = a;
+ a = t1 + t2;
+ t++;
+#else /* Unrolled to interweave the chain variables. */
+ t1 = h + Sum1 (e) + Ch (e, f, g) + k[t] + w[0];
+ t2 = Sum0 (a) + Maj (a, b, c);
+ d += t1;
+ h = t1 + t2;
+
+ t1 = g + Sum1 (d) + Ch (d, e, f) + k[t+1] + w[1];
+ t2 = Sum0 (h) + Maj (h, a, b);
+ c += t1;
+ g = t1 + t2;
+
+ t1 = f + Sum1 (c) + Ch (c, d, e) + k[t+2] + w[2];
+ t2 = Sum0 (g) + Maj (g, h, a);
+ b += t1;
+ f = t1 + t2;
+
+ t1 = e + Sum1 (b) + Ch (b, c, d) + k[t+3] + w[3];
+ t2 = Sum0 (f) + Maj (f, g, h);
+ a += t1;
+ e = t1 + t2;
+
+ t1 = d + Sum1 (a) + Ch (a, b, c) + k[t+4] + w[4];
+ t2 = Sum0 (e) + Maj (e, f, g);
+ h += t1;
+ d = t1 + t2;
+
+ t1 = c + Sum1 (h) + Ch (h, a, b) + k[t+5] + w[5];
+ t2 = Sum0 (d) + Maj (d, e, f);
+ g += t1;
+ c = t1 + t2;
+
+ t1 = b + Sum1 (g) + Ch (g, h, a) + k[t+6] + w[6];
+ t2 = Sum0 (c) + Maj (c, d, e);
+ f += t1;
+ b = t1 + t2;
+
+ t1 = a + Sum1 (f) + Ch (f, g, h) + k[t+7] + w[7];
+ t2 = Sum0 (b) + Maj (b, c, d);
+ e += t1;
+ a = t1 + t2;
+
+ t1 = h + Sum1 (e) + Ch (e, f, g) + k[t+8] + w[8];
+ t2 = Sum0 (a) + Maj (a, b, c);
+ d += t1;
+ h = t1 + t2;
+
+ t1 = g + Sum1 (d) + Ch (d, e, f) + k[t+9] + w[9];
+ t2 = Sum0 (h) + Maj (h, a, b);
+ c += t1;
+ g = t1 + t2;
+
+ t1 = f + Sum1 (c) + Ch (c, d, e) + k[t+10] + w[10];
+ t2 = Sum0 (g) + Maj (g, h, a);
+ b += t1;
+ f = t1 + t2;
+
+ t1 = e + Sum1 (b) + Ch (b, c, d) + k[t+11] + w[11];
+ t2 = Sum0 (f) + Maj (f, g, h);
+ a += t1;
+ e = t1 + t2;
+
+ t1 = d + Sum1 (a) + Ch (a, b, c) + k[t+12] + w[12];
+ t2 = Sum0 (e) + Maj (e, f, g);
+ h += t1;
+ d = t1 + t2;
+
+ t1 = c + Sum1 (h) + Ch (h, a, b) + k[t+13] + w[13];
+ t2 = Sum0 (d) + Maj (d, e, f);
+ g += t1;
+ c = t1 + t2;
+
+ t1 = b + Sum1 (g) + Ch (g, h, a) + k[t+14] + w[14];
+ t2 = Sum0 (c) + Maj (c, d, e);
+ f += t1;
+ b = t1 + t2;
+
+ t1 = a + Sum1 (f) + Ch (f, g, h) + k[t+15] + w[15];
+ t2 = Sum0 (b) + Maj (b, c, d);
+ e += t1;
+ a = t1 + t2;
+
+ t += 16;
+#endif
+ }
+
+ /* Update chaining vars. */
+ hd->h0 += a;
+ hd->h1 += b;
+ hd->h2 += c;
+ hd->h3 += d;
+ hd->h4 += e;
+ hd->h5 += f;
+ hd->h6 += g;
+ hd->h7 += h;
+
+ return /* burn_stack */ (8 + 16) * sizeof(u64) + sizeof(u32) +
+ 3 * sizeof(void*);
+}
+
+
+static unsigned int
+_SHA512_transform (SHA512_CONTEXT *ctx, const unsigned char *data)
+{
+ return __transform(&ctx->state, data) + 3 * sizeof(void*);
+}
+
+/* The routine final terminates the computation and
+ * returns the digest.
+ * The handle is prepared for a new cycle, but adding bytes to the
+ * handle will the destroy the returned buffer.
+ * Returns: 64 bytes representing the digest. When used for sha384,
+ * we take the leftmost 48 of those bytes.
+ */
+
+void SHA512_write (SHA512_CONTEXT *hd, const unsigned char *inbuf, unsigned long inlen)
+{
+ unsigned int stack_burn = 0;
+
+ if (hd->count == 128) { /* flush the buffer */
+ stack_burn = _SHA512_transform(hd, hd->buf);
+ _gcry_burn_stack(stack_burn);
+ hd->count = 0;
+ hd->nblocks++;
+ }
+ if (!inbuf) return;
+ if (hd->count) {
+ for (; inlen && hd->count < 128; inlen--)
+ hd->buf[hd->count++] = *inbuf++;
+ SHA512_write(hd, NULL, 0);
+ if (!inlen) return;
+ }
+ _gcry_burn_stack(stack_burn);
+
+ while (inlen >= 128) {
+ stack_burn = _SHA512_transform(hd, inbuf);
+ hd->count = 0;
+ hd->nblocks++;
+ inlen -= 128;
+ inbuf += 128;
+ }
+ for (; inlen && hd->count < 128; inlen--)
+ hd->buf[hd->count++] = *inbuf++;
+}
+
+void
+SHA512_final (unsigned char *outbuf, SHA512_CONTEXT *hd)
+{
+ unsigned int stack_burn_depth;
+ u64 t, msb, lsb;
+ unsigned char *p;
+
+ SHA512_write(hd, NULL, 0); /* flush */ ;
+
+ t = hd->nblocks;
+ /* multiply by 128 to make a byte count */
+ lsb = t << 7;
+ msb = t >> 57;
+ /* add the count */
+ t = lsb;
+ if ((lsb += hd->count) < t)
+ msb++;
+ /* multiply by 8 to make a bit count */
+ t = lsb;
+ lsb <<= 3;
+ msb <<= 3;
+ msb |= t >> 61;
+
+ if (hd->count < 112)
+ { /* enough room */
+ hd->buf[hd->count++] = 0x80; /* pad */
+ while (hd->count < 112)
+ hd->buf[hd->count++] = 0; /* pad */
+ }
+ else
+ { /* need one extra block */
+ hd->buf[hd->count++] = 0x80; /* pad character */
+ while (hd->count < 128)
+ hd->buf[hd->count++] = 0;
+ SHA512_write(hd, NULL, 0); /* flush */ ;
+ memset(hd->buf, 0, 112); /* fill next block with zeroes */
+ }
+ /* append the 128 bit count */
+ buf_put_be64(hd->buf + 112, msb);
+ buf_put_be64(hd->buf + 120, lsb);
+ stack_burn_depth = _SHA512_transform(hd, hd->buf);
+ _gcry_burn_stack(stack_burn_depth);
+
+ p = outbuf;
+#define X(a) do { *(u64*)p = be_bswap64(hd->state.h##a) ; p += 8; } while (0)
+ X (0);
+ X (1);
+ X (2);
+ X (3);
+ X (4);
+ X (5);
+ /* Note that these last two chunks are included even for SHA384.
+ We just ignore them. */
+ X (6);
+ X (7);
+#undef X
+}
+
+#undef ROTR
+#undef Ch
+#undef Maj
+#undef Sum0
+#undef Sum1
+
+/*
* The following codes for the arcfour stream cipher were modified
* by Jin-Hwan Cho on August 5, 2003 based on libgrypt-1.1.42.
*
@@ -316,12 +1138,12 @@ void MD5_final (unsigned char *outbuf, MD5_CONTEXT *hd)
* heavily modified for GnuPG by Werner Koch <wk@gnupg.org>
*/
-static void do_encrypt_stream (ARC4_KEY *ctx, unsigned char *outbuf, const unsigned char *inbuf, unsigned long len)
+static void do_encrypt_stream (ARC4_CONTEXT *ctx, unsigned char *outbuf, const unsigned char *inbuf, unsigned long len)
{
- register int i = ctx->idx_i;
- register int j = ctx->idx_j;
- register unsigned char *sbox = ctx->sbox;
- register int t;
+ int i = ctx->idx_i;
+ int j = ctx->idx_j;
+ unsigned char *sbox = ctx->sbox;
+ int t;
while (len--) {
i++;
@@ -336,13 +1158,13 @@ static void do_encrypt_stream (ARC4_KEY *ctx, unsigned char *outbuf, const unsig
ctx->idx_j = j;
}
-void ARC4 (ARC4_KEY *ctx, unsigned long len, const unsigned char *inbuf, unsigned char *outbuf)
+void ARC4 (ARC4_CONTEXT *ctx, unsigned long len, const unsigned char *inbuf, unsigned char *outbuf)
{
do_encrypt_stream(ctx, outbuf, inbuf, len);
_gcry_burn_stack(64);
}
-static void do_arcfour_setkey (ARC4_KEY *ctx, const unsigned char *key, unsigned int keylen)
+static void do_arcfour_setkey (ARC4_CONTEXT *ctx, const unsigned char *key, unsigned int keylen)
{
int i, j;
unsigned char karr[256];
@@ -360,8 +1182,760 @@ static void do_arcfour_setkey (ARC4_KEY *ctx, const unsigned char *key, unsigned
memset(karr, 0, 256);
}
-void ARC4_set_key (ARC4_KEY *ctx, unsigned int keylen, const unsigned char *key)
+void ARC4_set_key (ARC4_CONTEXT *ctx, unsigned int keylen, const unsigned char *key)
{
do_arcfour_setkey(ctx, key, keylen);
_gcry_burn_stack(300);
}
+
+/* AES Support */
+
+static int rijndaelSetupEncrypt(u32 *rk, const u8 *key, int keybits);
+static void rijndaelEncrypt(const u32 *rk, int nrounds,
+ const u8 plaintext[16], u8 ciphertext[16]);
+
+#define KEYLENGTH(keybits) ((keybits)/8)
+#define RKLENGTH(keybits) ((keybits)/8+28)
+#define NROUNDS(keybits) ((keybits)/32+6)
+
+#define KEYBITS 256
+
+typedef struct {
+ int nrounds;
+ u32 rk[60];
+ unsigned char iv[AES_BLOCKSIZE];
+} AES_CONTEXT;
+
+void
+AES_ecb_encrypt (const unsigned char *key, size_t key_len,
+ const unsigned char *plain, size_t plain_len,
+ unsigned char **cipher, size_t *cipher_len)
+{
+ AES_CONTEXT *ctx, aes;
+ const unsigned char *inptr;
+ unsigned char *outptr;
+ size_t len;
+
+ ctx = &aes;
+
+ *cipher_len = plain_len;
+ *cipher = NEW(*cipher_len, unsigned char);
+
+ ctx->nrounds = rijndaelSetupEncrypt(ctx->rk, key, key_len * 8);
+
+ inptr = plain; outptr = *cipher;
+ for (len = plain_len; len >= AES_BLOCKSIZE; len -= AES_BLOCKSIZE) {
+ rijndaelEncrypt(ctx->rk, ctx->nrounds, inptr, outptr);
+ inptr += AES_BLOCKSIZE;
+ outptr += AES_BLOCKSIZE;
+ }
+ if (len > 0) {
+ unsigned char block[AES_BLOCKSIZE];
+
+ memcpy(block, inptr, len);
+ rijndaelEncrypt(ctx->rk, ctx->nrounds, block, outptr);
+ inptr += len;
+ outptr += AES_BLOCKSIZE;
+ }
+}
+
+/* NULL iv means here "use random IV". */
+void
+AES_cbc_encrypt (const unsigned char *key, size_t key_len,
+ const unsigned char *iv, int padding,
+ const unsigned char *plain, size_t plain_len,
+ unsigned char **cipher, size_t *cipher_len)
+{
+ AES_CONTEXT *ctx, aes;
+ const unsigned char *inptr;
+ unsigned char *outptr, block[AES_BLOCKSIZE];
+ size_t len;
+ int i;
+ int padbytes;
+
+ ctx = &aes;
+
+ if (iv)
+ memcpy(ctx->iv, iv, AES_BLOCKSIZE);
+ else {
+ for (i = 0; i < AES_BLOCKSIZE; i++)
+ ctx->iv[i] = rand() % 256;
+ }
+ /* 16 bytes aligned.
+ * Note that when padding is enabled there can be excess 16-byte
+ * filled with 0x10. It occurs when size of the input data is multiple
+ * of 16.
+ */
+ padbytes = padding ? AES_BLOCKSIZE - (plain_len % AES_BLOCKSIZE) : \
+ ((plain_len % AES_BLOCKSIZE) ? \
+ AES_BLOCKSIZE - (plain_len % AES_BLOCKSIZE) : 0);
+
+ /* We do NOT write IV to the output stream if IV is explicitly specified. */
+ *cipher_len = plain_len + (iv ? 0 : AES_BLOCKSIZE) + padbytes;
+ *cipher = NEW(*cipher_len, unsigned char);
+
+ ctx->nrounds = rijndaelSetupEncrypt(ctx->rk, key, key_len * 8);
+
+ inptr = plain; outptr = *cipher;
+ if (!iv) {
+ memcpy(outptr, ctx->iv, AES_BLOCKSIZE);
+ outptr += AES_BLOCKSIZE;
+ }
+ for (len = plain_len; len >= AES_BLOCKSIZE; len -= AES_BLOCKSIZE) {
+ for (i = 0; i < AES_BLOCKSIZE; i++)
+ block[i] = inptr[i] ^ ctx->iv[i];
+ rijndaelEncrypt(ctx->rk, ctx->nrounds, block, outptr);
+ memcpy(ctx->iv, outptr, AES_BLOCKSIZE);
+ inptr += AES_BLOCKSIZE;
+ outptr += AES_BLOCKSIZE;
+ }
+ if (len > 0 || padding) {
+ for (i = 0; i < len; i++)
+ block[i] = inptr[i] ^ ctx->iv[i];
+ for (i = len; i < AES_BLOCKSIZE; i++)
+ block[i] = padbytes ^ ctx->iv[i];
+ rijndaelEncrypt(ctx->rk, ctx->nrounds, block, outptr);
+ memcpy(ctx->iv, outptr, AES_BLOCKSIZE);
+ inptr += AES_BLOCKSIZE;
+ outptr += AES_BLOCKSIZE;
+ }
+}
+
+/* The following section contains a Rijndael encryption implementation
+ * based on code from Philip J. Erdelsky's public domain one.
+ * They can be obtained from
+ *
+ * http://www.efgh.com/software/rijndael.htm
+ * http://www.efgh.com/software/rijndael.txt
+ */
+
+#define FULL_UNROLL
+
+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,
+};
+
+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,
+};
+
+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,
+};
+
+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,
+};
+
+static const u32 Te4[256] =
+{
+ 0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
+ 0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
+ 0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
+ 0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
+ 0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
+ 0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
+ 0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
+ 0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
+ 0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
+ 0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
+ 0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
+ 0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
+ 0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
+ 0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
+ 0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
+ 0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
+ 0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
+ 0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
+ 0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
+ 0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
+ 0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
+ 0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
+ 0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
+ 0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
+ 0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
+ 0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
+ 0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
+ 0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
+ 0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
+ 0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
+ 0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
+ 0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
+ 0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
+ 0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
+ 0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
+ 0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
+ 0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
+ 0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
+ 0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
+ 0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
+ 0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
+ 0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
+ 0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
+ 0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
+ 0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
+ 0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
+ 0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
+ 0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
+ 0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
+ 0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
+ 0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
+ 0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
+ 0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
+ 0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
+ 0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
+ 0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
+ 0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
+ 0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
+ 0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
+ 0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
+ 0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
+ 0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
+ 0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
+ 0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
+};
+
+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 */
+};
+
+#define GETU32(plaintext) (((u32)(plaintext)[0] << 24) ^ \
+ ((u32)(plaintext)[1] << 16) ^ \
+ ((u32)(plaintext)[2] << 8) ^ \
+ ((u32)(plaintext)[3]))
+
+#define PUTU32(ciphertext, st) { (ciphertext)[0] = (u8)((st) >> 24); \
+ (ciphertext)[1] = (u8)((st) >> 16); \
+ (ciphertext)[2] = (u8)((st) >> 8); \
+ (ciphertext)[3] = (u8)(st); }
+
+/**
+ * Expand the cipher key into the encryption key schedule.
+ *
+ * @return the number of rounds for the given cipher key size.
+ */
+int rijndaelSetupEncrypt(u32 *rk, const u8 *key, int keybits)
+{
+ int i = 0;
+ u32 temp;
+
+ rk[0] = GETU32(key );
+ rk[1] = GETU32(key + 4);
+ rk[2] = GETU32(key + 8);
+ rk[3] = GETU32(key + 12);
+ if (keybits == 128)
+ {
+ for (;;)
+ {
+ temp = rk[3];
+ rk[4] = rk[0] ^
+ (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+ (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^
+ (Te4[(temp ) & 0xff] & 0x0000ff00) ^
+ (Te4[(temp >> 24) ] & 0x000000ff) ^
+ rcon[i];
+ rk[5] = rk[1] ^ rk[4];
+ rk[6] = rk[2] ^ rk[5];
+ rk[7] = rk[3] ^ rk[6];
+ if (++i == 10)
+ return 10;
+ rk += 4;
+ }
+ }
+ rk[4] = GETU32(key + 16);
+ rk[5] = GETU32(key + 20);
+ if (keybits == 192)
+ {
+ for (;;)
+ {
+ temp = rk[ 5];
+ rk[ 6] = rk[ 0] ^
+ (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+ (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^
+ (Te4[(temp ) & 0xff] & 0x0000ff00) ^
+ (Te4[(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 12;
+ rk[10] = rk[ 4] ^ rk[ 9];
+ rk[11] = rk[ 5] ^ rk[10];
+ rk += 6;
+ }
+ }
+ rk[6] = GETU32(key + 24);
+ rk[7] = GETU32(key + 28);
+ if (keybits == 256)
+ {
+ for (;;)
+ {
+ temp = rk[ 7];
+ rk[ 8] = rk[ 0] ^
+ (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
+ (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^
+ (Te4[(temp ) & 0xff] & 0x0000ff00) ^
+ (Te4[(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 14;
+ temp = rk[11];
+ rk[12] = rk[ 4] ^
+ (Te4[(temp >> 24) ] & 0xff000000) ^
+ (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(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;
+}
+
+void rijndaelEncrypt(const u32 *rk, int nrounds,
+ const u8 plaintext[16], u8 ciphertext[16])
+{
+ u32 s0, s1, s2, s3, t0, t1, t2, t3;
+ #ifndef FULL_UNROLL
+ int r;
+ #endif /* ?FULL_UNROLL */
+ /*
+ * map byte array block to cipher state
+ * and add initial round key:
+ */
+ s0 = GETU32(plaintext ) ^ rk[0];
+ s1 = GETU32(plaintext + 4) ^ rk[1];
+ s2 = GETU32(plaintext + 8) ^ rk[2];
+ s3 = GETU32(plaintext + 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];
+ /* 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];
+ /* 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];
+ /* 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];
+ /* 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 (nrounds > 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 (nrounds > 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 += nrounds << 2;
+ #else /* !FULL_UNROLL */
+ /*
+ * nrounds - 1 full rounds:
+ */
+ r = nrounds >> 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;
+ 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 =
+ (Te4[(t0 >> 24) ] & 0xff000000) ^
+ (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(t2 >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(t3 ) & 0xff] & 0x000000ff) ^
+ rk[0];
+ PUTU32(ciphertext , s0);
+ s1 =
+ (Te4[(t1 >> 24) ] & 0xff000000) ^
+ (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(t3 >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(t0 ) & 0xff] & 0x000000ff) ^
+ rk[1];
+ PUTU32(ciphertext + 4, s1);
+ s2 =
+ (Te4[(t2 >> 24) ] & 0xff000000) ^
+ (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(t0 >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(t1 ) & 0xff] & 0x000000ff) ^
+ rk[2];
+ PUTU32(ciphertext + 8, s2);
+ s3 =
+ (Te4[(t3 >> 24) ] & 0xff000000) ^
+ (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
+ (Te4[(t1 >> 8) & 0xff] & 0x0000ff00) ^
+ (Te4[(t2 ) & 0xff] & 0x000000ff) ^
+ rk[3];
+ PUTU32(ciphertext + 12, s3);
+}
diff --git a/Build/source/texk/dvipdfm-x/dpxcrypt.h b/Build/source/texk/dvipdfm-x/dpxcrypt.h
index 16a856cb369..5b390f63b08 100644
--- a/Build/source/texk/dvipdfm-x/dpxcrypt.h
+++ b/Build/source/texk/dvipdfm-x/dpxcrypt.h
@@ -29,25 +29,73 @@
# include <stdint.h>
#endif
+typedef uint64_t u64;
+typedef uint32_t u32;
+typedef uint8_t u8;
+
/* libgcrypt md5 */
typedef struct {
- uint32_t A,B,C,D; /* chaining variables */
- unsigned long nblocks;
+ uint32_t A, B, C, D; /* chaining variables */
+ size_t nblocks;
unsigned char buf[64];
int count;
} MD5_CONTEXT;
void MD5_init (MD5_CONTEXT *ctx);
-void MD5_write (MD5_CONTEXT *ctx, const unsigned char *inbuf, unsigned long inlen);
-void MD5_final (unsigned char *outbuf, MD5_CONTEXT *ctx);
+void MD5_write(MD5_CONTEXT *ctx, const unsigned char *inbuf, unsigned long inlen);
+void MD5_final(unsigned char *outbuf, MD5_CONTEXT *ctx);
+
+typedef struct {
+ u32 h0,h1,h2,h3,h4,h5,h6,h7;
+ size_t nblocks;
+ unsigned char buf[64];
+ int count;
+} SHA256_CONTEXT;
+
+typedef struct
+{
+ u64 h0, h1, h2, h3, h4, h5, h6, h7;
+} SHA512_STATE;
+
+typedef struct
+{
+ SHA512_STATE state;
+ size_t nblocks;
+ unsigned char buf[128];
+ int count;
+} SHA512_CONTEXT;
+
+void SHA256_init (SHA256_CONTEXT *ctx);
+void SHA256_write(SHA256_CONTEXT *ctx,
+ const unsigned char *inbuf, unsigned long inlen);
+void SHA256_final(unsigned char *outbuf, SHA256_CONTEXT *ctx);
+
+void SHA384_init (SHA512_CONTEXT *ctx);
+#define SHA384_write(c,b,l) SHA512_write((c),(b),(l))
+#define SHA384_final(b,c) SHA512_final((b),(c))
+void SHA512_init (SHA512_CONTEXT *ctx);
+void SHA512_write(SHA512_CONTEXT *ctx,
+ const unsigned char *inbuf, unsigned long inlen);
+void SHA512_final(unsigned char *outbuf, SHA512_CONTEXT *ctx);
/* libgcrypt arcfour */
typedef struct {
int idx_i, idx_j;
unsigned char sbox[256];
-} ARC4_KEY;
+} ARC4_CONTEXT;
+
+#define AES_BLOCKSIZE 16
+
+void ARC4 (ARC4_CONTEXT *ctx, unsigned long len, const unsigned char *inbuf, unsigned char *outbuf);
+void ARC4_set_key (ARC4_CONTEXT *ctx, unsigned int keylen, const unsigned char *key);
+
+void AES_ecb_encrypt (const unsigned char *key, size_t key_len,
+ const unsigned char *plain, size_t plain_len,
+ unsigned char **cipher, size_t *cipher_len);
-void ARC4 (ARC4_KEY *ctx, unsigned long len, const unsigned char *inbuf, unsigned char *outbuf);
-void ARC4_set_key (ARC4_KEY *ctx, unsigned int keylen, const unsigned char *key);
+void AES_cbc_encrypt (const unsigned char *key, size_t key_len,
+ const unsigned char *iv, int padding,
+ const unsigned char *plain, size_t plain_len,
+ unsigned char **cipher, size_t *cipher_len);
#endif /* _DPXCRYPT_H_ */
diff --git a/Build/source/texk/dvipdfm-x/dvi.c b/Build/source/texk/dvipdfm-x/dvi.c
index 3645dde1505..198da83e794 100644
--- a/Build/source/texk/dvipdfm-x/dvi.c
+++ b/Build/source/texk/dvipdfm-x/dvi.c
@@ -2120,9 +2120,10 @@ read_length (double *vp, double mag, const char **pp, const char *endptr)
static int
-scan_special (double *wd, double *ht, double *xo, double *yo, char *lm,
- unsigned *minorversion,
- int *do_enc, unsigned *key_bits, unsigned *permission, char *owner_pw, char *user_pw,
+scan_special (double *wd, double *ht, double *xo, double *yo, int *lm,
+ int *majorversion, int *minorversion,
+ int *do_enc, int *key_bits, int32_t *permission,
+ char *owner_pw, char *user_pw,
const char *buf, uint32_t size)
{
char *q;
@@ -2227,7 +2228,16 @@ scan_special (double *wd, double *ht, double *xo, double *yo, char *lm,
skip_white(&p, endptr);
kv = parse_float_decimal(&p, endptr);
if (kv) {
- *minorversion = (unsigned)strtol(kv, NULL, 10);
+ *minorversion = (int)strtol(kv, NULL, 10);
+ RELEASE(kv);
+ }
+ } else if (majorversion && ns_pdf && !strcmp(q, "majorversion")) {
+ char *kv;
+ if (*p == '=') p++;
+ skip_white(&p, endptr);
+ kv = parse_float_decimal(&p, endptr);
+ if (kv) {
+ *majorversion = (int)strtol(kv, NULL, 10);
RELEASE(kv);
}
} else if (ns_pdf && !strcmp(q, "encrypt") && do_enc) {
@@ -2283,9 +2293,10 @@ scan_special (double *wd, double *ht, double *xo, double *yo, char *lm,
void
dvi_scan_specials (int page_no,
double *page_width, double *page_height,
- double *x_offset, double *y_offset, char *landscape,
- unsigned *minorversion,
- int *do_enc, unsigned *key_bits, unsigned *permission, char *owner_pw, char *user_pw)
+ double *x_offset, double *y_offset, int *landscape,
+ int *majorversion, int *minorversion,
+ int *do_enc, int *key_bits, int32_t *permission,
+ char *owner_pw, char *user_pw)
{
FILE *fp = dvi_file;
int32_t offset;
@@ -2328,11 +2339,12 @@ dvi_scan_specials (int page_no,
dvi_page_buf_size = (dvi_page_buf_index + size + DVI_PAGE_BUF_CHUNK);
dvi_page_buffer = RENEW(dvi_page_buffer, dvi_page_buf_size, unsigned char);
}
-#define buf (char*)dvi_page_buffer + dvi_page_buf_index
+#define buf ((char*)(dvi_page_buffer + dvi_page_buf_index))
if (fread(buf, sizeof(char), size, fp) != size)
ERROR("Reading DVI file failed!");
if (scan_special(page_width, page_height, x_offset, y_offset, landscape,
- minorversion, do_enc, key_bits, permission, owner_pw, user_pw,
+ majorversion, minorversion,
+ do_enc, key_bits, permission, owner_pw, user_pw,
buf, size))
WARN("Reading special command failed: \"%.*s\"", size, buf);
#undef buf
@@ -2407,4 +2419,3 @@ dvi_scan_specials (int page_no,
return;
}
-
diff --git a/Build/source/texk/dvipdfm-x/dvi.h b/Build/source/texk/dvipdfm-x/dvi.h
index 667bc76b961..aacfb11b29c 100644
--- a/Build/source/texk/dvipdfm-x/dvi.h
+++ b/Build/source/texk/dvipdfm-x/dvi.h
@@ -30,7 +30,7 @@
/* instantiated in dvipdfmx.c */
extern double paper_width, paper_height;
-extern char landscape_mode;
+extern int landscape_mode;
extern double get_origin (int x);
@@ -72,9 +72,10 @@ extern void dvi_dir (unsigned char dir);
extern void dvi_do_page (double paper_height, double x_offset, double y_offset);
extern void dvi_scan_specials (int page_no,
double *width, double *height,
- double *x_offset, double *y_offset,
- char *landscape, unsigned *minorversion,
- int *do_enc, unsigned *key_bits, unsigned *permission, char *owner_pw, char *user_pw);
+ double *x_offset, double *y_offset, int *landscape,
+ int *majorversion, int *minorversion,
+ int *do_enc, int *keybits, int32_t *perm,
+ char *opasswd, char *upasswd);
extern int dvi_locate_font (const char *name, spt_t ptsize);
/* link or nolink:
diff --git a/Build/source/texk/dvipdfm-x/dvipdfmx.c b/Build/source/texk/dvipdfm-x/dvipdfmx.c
index f95614d0ce1..7b488614695 100644
--- a/Build/source/texk/dvipdfm-x/dvipdfmx.c
+++ b/Build/source/texk/dvipdfm-x/dvipdfmx.c
@@ -104,15 +104,15 @@ static int image_cache_life = -2;
/* Encryption */
static int do_encryption = 0;
-static unsigned key_bits = 40;
-static unsigned permission = 0x003C;
+static int key_bits = 40;
+static int32_t permission = 0x003C;
/* Page device */
double paper_width = 595.0;
double paper_height = 842.0;
static double x_offset = 72.0;
static double y_offset = 72.0;
-char landscape_mode = 0;
+int landscape_mode = 0;
int always_embed = 0; /* always embed fonts, regardless of licensing flags */
@@ -597,7 +597,8 @@ do_args (int argc, char *argv[])
case 'K':
CHECK_ARG(1, "encryption key length");
key_bits = (unsigned) atoi(argv[1]);
- if (key_bits < 40 || key_bits > 128 || (key_bits & 0x7))
+ if (!(key_bits >= 40 && key_bits <= 128 && (key_bits % 8 == 0)) &&
+ key_bits != 256)
ERROR("Invalid encryption key length specified: %s", argv[1]);
POP_ARG();
break;
@@ -787,14 +788,14 @@ do_dvi_pages (void)
while (dvi_npages()) {
if (page_no < dvi_npages()) {
double w, h, xo, yo;
- char lm;
+ int lm;
MESG("[%d", page_no+1);
/* Users want to change page size even after page is started! */
page_width = paper_width; page_height = paper_height;
w = page_width; h = page_height; lm = landscape_mode;
xo = x_offset; yo = y_offset;
- dvi_scan_specials(page_no, &w, &h, &xo, &yo, &lm, NULL, NULL, NULL, NULL, NULL, NULL);
+ dvi_scan_specials(page_no, &w, &h, &xo, &yo, &lm, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
if (lm != landscape_mode) {
SWAP(w, h);
landscape_mode = lm;
@@ -1024,7 +1025,7 @@ CDECL main (int argc, char *argv[])
y_offset = 0.0;
dvi2pts = 0.01; /* dvi2pts controls accuracy. */
} else {
- unsigned ver_minor = 0;
+ int ver_major = 0, ver_minor = 0;
char owner_pw[MAX_PWD_LEN], user_pw[MAX_PWD_LEN];
/* Dependency between DVI and PDF side is rather complicated... */
dvi2pts = dvi_init(dvi_filename, mag);
@@ -1033,26 +1034,39 @@ CDECL main (int argc, char *argv[])
pdf_doc_set_creator(dvi_comment());
- if (do_encryption)
+ if (do_encryption) {
/* command line takes precedence */
- dvi_scan_specials(0, &paper_width, &paper_height, &x_offset, &y_offset, &landscape_mode,
- &ver_minor, NULL, NULL, NULL, NULL, NULL);
- else {
- dvi_scan_specials(0, &paper_width, &paper_height, &x_offset, &y_offset, &landscape_mode,
- &ver_minor, &do_encryption, &key_bits, &permission, owner_pw, user_pw);
+ dvi_scan_specials(0,
+ &paper_width, &paper_height,
+ &x_offset, &y_offset, &landscape_mode,
+ &ver_major, &ver_minor,
+ NULL, NULL, NULL, NULL, NULL);
+ /* FIXME: pdf_set_version() should come before ecrcyption setting.
+ * It's too late to set here...
+ */
+ if (ver_minor >= PDF_VERSION_MIN && ver_minor <= PDF_VERSION_MAX) {
+ pdf_set_version(ver_minor);
+ }
+ } else {
+ dvi_scan_specials(0,
+ &paper_width, &paper_height,
+ &x_offset, &y_offset, &landscape_mode,
+ &ver_major, &ver_minor,
+ &do_encryption, &key_bits, &permission, owner_pw, user_pw);
+ if (ver_minor >= PDF_VERSION_MIN && ver_minor <= PDF_VERSION_MAX) {
+ pdf_set_version(ver_minor);
+ }
if (do_encryption) {
- if (key_bits < 40 || key_bits > 128 || (key_bits & 0x7))
+ if (!(key_bits >= 40 && key_bits <= 128 && (key_bits % 8 == 0)) &&
+ key_bits != 256)
ERROR("Invalid encryption key length specified: %u", key_bits);
else if (key_bits > 40 && pdf_get_version() < 4)
- ERROR("Chosen key length requires at least PDF 1.4. "
+ ERROR("Chosen key length requires at least PDF 1.4. " \
"Use \"-V 4\" to change.");
do_encryption = 1;
pdf_enc_set_passwd(key_bits, permission, owner_pw, user_pw);
}
}
- if (ver_minor >= PDF_VERSION_MIN && ver_minor <= PDF_VERSION_MAX) {
- pdf_set_version(ver_minor);
- }
if (landscape_mode) {
SWAP(paper_width, paper_height);
}
diff --git a/Build/source/texk/dvipdfm-x/jpegimage.c b/Build/source/texk/dvipdfm-x/jpegimage.c
index 863c6949b95..82179e0e947 100644
--- a/Build/source/texk/dvipdfm-x/jpegimage.c
+++ b/Build/source/texk/dvipdfm-x/jpegimage.c
@@ -129,34 +129,34 @@ typedef enum {
struct JPEG_APPn_JFIF /* APP0 */
{
- unsigned short version;
- unsigned char units; /* 0: only aspect ratio
+ uint16_t version;
+ uint8_t units; /* 0: only aspect ratio
* 1: dots per inch
* 2: dots per cm
*/
- unsigned short Xdensity;
- unsigned short Ydensity;
- unsigned char Xthumbnail;
- unsigned char Ythumbnail;
+ uint16_t Xdensity;
+ uint16_t Ydensity;
+ uint8_t Xthumbnail;
+ uint8_t Ythumbnail;
unsigned char *thumbnail; /* Thumbnail data. */
};
struct JPEG_APPn_ICC /* APP2 */
{
- unsigned char seq_id;
- unsigned char num_chunks;
+ uint8_t seq_id;
+ uint8_t num_chunks;
unsigned char *chunk;
/* Length of ICC profile data in this chunk. */
- unsigned short length;
+ size_t length;
};
struct JPEG_APPn_Adobe /* APP14 */
{
- unsigned short version;
- unsigned short flag0;
- unsigned short flag1;
- unsigned char transform; /* color transform code */
+ uint16_t version;
+ uint16_t flag0;
+ uint16_t flag1;
+ uint8_t transform; /* color transform code */
};
struct JPEG_APPn_XMP /* APP1 */
@@ -164,7 +164,7 @@ struct JPEG_APPn_XMP /* APP1 */
unsigned char *packet; /* XMP packet */
/* Length of XMP packet data */
- unsigned short length;
+ size_t length;
};
struct JPEG_ext
@@ -177,11 +177,11 @@ struct JPEG_ext
#define MAX_COUNT 1024
struct JPEG_info
{
- unsigned short height;
- unsigned short width;
+ uint16_t height;
+ uint16_t width;
- unsigned char bits_per_component;
- unsigned char num_components;
+ uint8_t bits_per_component;
+ uint8_t num_components;
double xdpi;
double ydpi;
@@ -608,8 +608,8 @@ read_exif_bytes (unsigned char **pp, int n, int endian)
#define JPEG_EXIF_TAG_XRESOLUTION 282
#define JPEG_EXIF_TAG_YRESOLUTION 283
#define JPEG_EXIF_TAG_RESOLUTIONUNIT 296
-static unsigned short
-read_APP1_Exif (struct JPEG_info *j_info, FILE *fp, unsigned short length)
+static size_t
+read_APP1_Exif (struct JPEG_info *j_info, FILE *fp, size_t length)
{
/* this doesn't save the data, just reads the tags we need */
/* based on info from http://www.exif.org/Exif2-2.PDF */
@@ -630,6 +630,8 @@ read_APP1_Exif (struct JPEG_info *j_info, FILE *fp, unsigned short length)
while ((p < endptr) && (*p == 0))
p++;
+ if (p + 8 >= endptr)
+ goto err;
/* TIFF header */
tiff_header = p;
if ((p[0] == 'M') && (p[1] == 'M'))
@@ -650,6 +652,8 @@ read_APP1_Exif (struct JPEG_info *j_info, FILE *fp, unsigned short length)
offset = read_exif_bytes(&p, 4, endian);
p = tiff_header + offset;
+ if (p + 2 >= endptr)
+ goto err;
num_fields = read_exif_bytes(&p, 2, endian);
while (num_fields-- > 0 && p < endptr) {
int tag, type;
@@ -742,11 +746,11 @@ err:
return length;
}
-static unsigned short
+static size_t
read_APP0_JFIF (struct JPEG_info *j_info, FILE *fp)
{
struct JPEG_APPn_JFIF *app_data;
- unsigned short thumb_data_len;
+ size_t thumb_data_len;
app_data = NEW(1, struct JPEG_APPn_JFIF);
app_data->version = get_unsigned_pair(fp);
@@ -783,8 +787,8 @@ read_APP0_JFIF (struct JPEG_info *j_info, FILE *fp)
return (9 + thumb_data_len);
}
-static unsigned short
-read_APP0_JFXX (FILE *fp, unsigned short length)
+static size_t
+read_APP0_JFXX (FILE *fp, size_t length)
{
get_unsigned_byte(fp);
/* Extension Code:
@@ -800,8 +804,8 @@ read_APP0_JFXX (FILE *fp, unsigned short length)
return length;
}
-static unsigned short
-read_APP1_XMP (struct JPEG_info *j_info, FILE *fp, unsigned short length)
+static size_t
+read_APP1_XMP (struct JPEG_info *j_info, FILE *fp, size_t length)
{
struct JPEG_APPn_XMP *app_data;
@@ -815,8 +819,8 @@ read_APP1_XMP (struct JPEG_info *j_info, FILE *fp, unsigned short length)
return length;
}
-static unsigned short
-read_APP2_ICC (struct JPEG_info *j_info, FILE *fp, unsigned short length)
+static size_t
+read_APP2_ICC (struct JPEG_info *j_info, FILE *fp, size_t length)
{
struct JPEG_APPn_ICC *app_data;
@@ -836,7 +840,7 @@ static int
JPEG_copy_stream (struct JPEG_info *j_info, pdf_obj *stream, FILE *fp)
{
JPEG_marker marker;
- long length;
+ size_t length;
int found_SOFn, count;
#define SKIP_CHUNK(j,c) ((j)->skipbits[(c) / 8] & (1 << (7 - (c) % 8)))
diff --git a/Build/source/texk/dvipdfm-x/pdfencrypt.c b/Build/source/texk/dvipdfm-x/pdfencrypt.c
index 480823ca6cb..56853f59589 100644
--- a/Build/source/texk/dvipdfm-x/pdfencrypt.c
+++ b/Build/source/texk/dvipdfm-x/pdfencrypt.c
@@ -36,41 +36,57 @@
#include "system.h"
#include "mem.h"
+#include "numbers.h"
#include "error.h"
#include "pdfobj.h"
+#include "unicode.h"
#include "dpxcrypt.h"
-#include "pdfencrypt.h"
+/* Encryption support
+ *
+ * Supported: 40-128 bit RC4, 128 bit AES, 256 bit AES
+ *
+ * TODO: Convert password to PDFDocEncoding. SASLPrep stringpref for AESV3.
+ */
-#include "dvipdfmx.h"
+/* PDF-2.0 is not published yet. */
+#define USE_ADOBE_EXTENSION 1
-#define MAX_KEY_LEN 16
-#define MAX_STR_LEN 32
+#ifdef USE_ADOBE_EXTENSION
+#include "pdfdoc.h"
+#endif
-static unsigned char algorithm, revision, key_size;
-static long permission;
+#include "dvipdfmx.h"
+#include "pdfencrypt.h"
-static unsigned char key_data[MAX_KEY_LEN], id_string[MAX_KEY_LEN];
-static unsigned char opwd_string[MAX_STR_LEN], upwd_string[MAX_STR_LEN];
+static struct pdf_sec {
+ unsigned char key[32];
+ int key_size;
-static unsigned long current_label = 0;
-static unsigned current_generation = 0;
+ unsigned char ID[16];
+ unsigned char O[48], U[48];
+ unsigned char OE[32], UE[32];
+ int V, R;
+ int32_t P;
-static ARC4_KEY key;
-static MD5_CONTEXT md5_ctx;
+ struct {
+ int use_aes;
+ int encrypt_metadata;
+ } setting;
-static unsigned char md5_buf[MAX_KEY_LEN], key_buf[MAX_KEY_LEN];
-static unsigned char in_buf[MAX_STR_LEN], out_buf[MAX_STR_LEN];
+ struct {
+ uint64_t objnum;
+ uint16_t gennum;
+ } label;
+} sec_data;
-static const unsigned char padding_string[MAX_STR_LEN] = {
+static const unsigned char padding_bytes[32] = {
0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41,
0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08,
0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, 0x3e, 0x80,
0x2f, 0x0c, 0xa9, 0xfe, 0x64, 0x53, 0x69, 0x7a
};
-static char owner_passwd[MAX_PWD_LEN], user_passwd[MAX_PWD_LEN];
-
static unsigned char verbose = 0;
void pdf_enc_set_verbose (void)
@@ -78,277 +94,344 @@ void pdf_enc_set_verbose (void)
if (verbose < 255) verbose++;
}
-#define PRODUCER "%s-%s, Copyright 2002-2014 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata"
-void pdf_enc_compute_id_string (char *dviname, char *pdfname)
+void
+pdf_enc_init (int use_aes, int encrypt_metadata)
+{
+ struct pdf_sec *p = &sec_data;
+
+ srand((unsigned) time(NULL)); /* For AES IV */
+ p->setting.use_aes = use_aes;
+ p->setting.encrypt_metadata = encrypt_metadata;
+}
+
+#define PRODUCER \
+"%s-%s, Copyright 2002-2014 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata"
+
+void
+pdf_enc_compute_id_string (char *dviname, char *pdfname)
{
+ struct pdf_sec *p = &sec_data;
char *date_string, *producer;
time_t current_time;
struct tm *bd_time;
+ MD5_CONTEXT md5;
+
+ /* FIXME: This should be placed in main() or somewhere. */
+ pdf_enc_init(1, 1);
- MD5_init(&md5_ctx);
+ MD5_init(&md5);
- date_string = NEW (15, char);
+ date_string = NEW(15, char);
time(&current_time);
bd_time = localtime(&current_time);
- sprintf (date_string, "%04d%02d%02d%02d%02d%02d",
- bd_time -> tm_year+1900, bd_time -> tm_mon+1, bd_time -> tm_mday,
- bd_time -> tm_hour, bd_time -> tm_min, bd_time -> tm_sec);
- MD5_write(&md5_ctx, (unsigned char *)date_string, strlen(date_string));
- RELEASE (date_string);
+ sprintf(date_string, "%04d%02d%02d%02d%02d%02d",
+ bd_time->tm_year + 1900, bd_time->tm_mon + 1, bd_time->tm_mday,
+ bd_time->tm_hour, bd_time->tm_min, bd_time->tm_sec);
+ MD5_write(&md5, (unsigned char *)date_string, strlen(date_string));
+ RELEASE(date_string);
- producer = NEW (strlen(PRODUCER)+strlen(my_name)+strlen(VERSION), char);
+ producer = NEW(strlen(PRODUCER)+strlen(my_name)+strlen(VERSION), char);
sprintf(producer, PRODUCER, my_name, VERSION);
- MD5_write(&md5_ctx, (unsigned char *)producer, strlen(producer));
- RELEASE (producer);
+ MD5_write(&md5, (unsigned char *)producer, strlen(producer));
+ RELEASE(producer);
if (dviname)
- MD5_write(&md5_ctx, (unsigned char *)dviname, strlen(dviname));
+ MD5_write(&md5, (unsigned char *)dviname, strlen(dviname));
if (pdfname)
- MD5_write(&md5_ctx, (unsigned char *)pdfname, strlen(pdfname));
- MD5_final(id_string, &md5_ctx);
+ MD5_write(&md5, (unsigned char *)pdfname, strlen(pdfname));
+ MD5_final(p->ID, &md5);
}
-static void passwd_padding (unsigned char *src, unsigned char *dst)
+static void
+passwd_padding (const char *src, unsigned char *dst)
{
- register int len = strlen((char *)src);
+ int len;
- if (len > MAX_STR_LEN)
- len = MAX_STR_LEN;
+ len = MIN(32, strlen((char *)src));
memcpy(dst, src, len);
- memcpy(dst+len, padding_string, MAX_STR_LEN-len);
+ memcpy(dst + len, padding_bytes, 32 - len);
}
-static void compute_owner_password (void)
+static void
+compute_owner_password (struct pdf_sec *p,
+ const char *opasswd, const char *upasswd)
{
- register unsigned char i, j;
- /*
- * Algorithm 3.3 Computing the encryption dictionary's O (owner password)
- * value
- *
- * 1. Pad or truncate the owner password string as described in step 1
- * of Algorithm 3.2. If there is no owner password, use the user
- * password instead. (See implementation note 17 in Appendix H.)
- */
- passwd_padding((unsigned char *)(strlen(owner_passwd) > 0 ? owner_passwd : user_passwd), in_buf);
- /*
- * 2. Initialize the MD5 hash function and pass the result of step 1
- * as input to this function.
- */
- MD5_init(&md5_ctx);
- MD5_write(&md5_ctx, in_buf, MAX_STR_LEN);
- MD5_final(md5_buf, &md5_ctx);
- /*
- * 3. (Revision 3 only) Do the following 50 times: Take the output
- * from the previous MD5 hash and pass it as input into a new
- * MD5 hash.
- */
- if (revision == 3)
+ int i, j;
+ unsigned char padded[32];
+ MD5_CONTEXT md5;
+ ARC4_CONTEXT arc4;
+ unsigned char hash[16];
+
+ passwd_padding((strlen(opasswd) > 0 ? opasswd : upasswd), padded);
+
+ MD5_init (&md5);
+ MD5_write(&md5, padded, 32);
+ MD5_final(hash, &md5);
+ if (p->R >= 3) {
for (i = 0; i < 50; i++) {
/*
* NOTE: We truncate each MD5 hash as in the following step.
* Otherwise Adobe Reader won't decrypt the PDF file.
*/
- MD5_init(&md5_ctx);
- MD5_write(&md5_ctx, md5_buf, key_size);
- MD5_final(md5_buf, &md5_ctx);
+ MD5_init (&md5);
+ MD5_write(&md5, hash, p->key_size);
+ MD5_final(hash, &md5);
}
- /*
- * 4. Create an RC4 encryption key using the first n bytes of the output
- * from the final MD5 hash, where n is always 5 for revision 2 but
- * for revision 3 depends on the value of the encryption dictionary's
- * Length entry.
- */
- ARC4_set_key(&key, key_size, md5_buf);
- /*
- * 5. Pad or truncate the user password string as described in step 1
- * of Algorithm 3.2.
- */
- passwd_padding((unsigned char *)user_passwd, in_buf);
- /*
- * 6. Encrypt the result of step 5, using an RC4 encryption function
- * with the encryption key obtained in step 4.
- */
- ARC4(&key, MAX_STR_LEN, in_buf, out_buf);
- /*
- * 7. (Revision 3 only) Do the following 19 times: Take the output
- * from the previous invocation of the RC4 function and pass it
- * as input to a new invocation of the function; use an encryption
- * key generated by taking each byte of the encryption key obtained
- * in step 4 and performing an XOR (exclusive or) operation between
- * that byte and the single-byte value of the iteration counter
- * (from 1 to 19).
- */
- if (revision == 3)
+ }
+ ARC4_set_key(&arc4, p->key_size, hash);
+ passwd_padding(upasswd, padded);
+ {
+ unsigned char tmp1[32], tmp2[32];
+ unsigned char key[16];
+
+ ARC4(&arc4, 32, padded, tmp1);
+ if (p->R >= 3) {
for (i = 1; i <= 19; i++) {
- memcpy(in_buf, out_buf, MAX_STR_LEN);
- for (j = 0; j < key_size; j++)
- key_buf[j] = md5_buf[j] ^ i;
- ARC4_set_key(&key, key_size, key_buf);
- ARC4(&key, MAX_STR_LEN, in_buf, out_buf);
+ memcpy(tmp2, tmp1, 32);
+ for (j = 0; j < p->key_size; j++)
+ key[j] = hash[j] ^ i;
+ ARC4_set_key(&arc4, p->key_size, key);
+ ARC4(&arc4, 32, tmp2, tmp1);
}
- /*
- * 8. Store the output from the final invocation of the RC4 function
- * as the value of the O entry in the encryption dictionary.
- */
- memcpy(opwd_string, out_buf, MAX_STR_LEN);
+ }
+ }
+ memcpy(p->O, hash, 32);
}
-static void compute_encryption_key (unsigned char *pwd)
+static void
+compute_encryption_key (struct pdf_sec *p, const char *passwd)
{
- register unsigned char i;
- /*
- * Algorithm 3.2 Computing an encryption key
- *
- * 1. Pad or truncate the password string to exactly 32 bytes. If the
- * password string is more than 32 bytes long, use only its first
- * 32 bytes; if it is less than 32 bytes long, pad it by appending
- * the required number of additional bytes from the beginning of
- * the following padding string:
- *
- * < 28 BF 4E 5E 4E 75 8A 41 64 00 4E 56 FF FA 01 08
- * 2E 2E 00 B6 D0 68 3E 80 2F 0C A9 FE 64 53 69 7A >
- *
- * That is, if the password string is n bytes long, append the
- * first 32 - n bytes of the padding string to the end of the
- * password string. If the password string is empty (zero-length),
- * meaning there is no user password, substitute the entire
- * padding string in its place.
- */
- passwd_padding(pwd, in_buf);
- /*
- * 2. Initialize the MD5 hash function and pass the result of step 1
- * as input to this fuction.
- */
- MD5_init(&md5_ctx);
- MD5_write(&md5_ctx, in_buf, MAX_STR_LEN);
- /*
- * 3. Pass the value of the encryption dictionary's O entry to the
- * MD5 hash function. (Algorithm 3.3 shows how the O value is
- * computed.)
- */
- MD5_write(&md5_ctx, opwd_string, MAX_STR_LEN);
- /*
- * 4. Treat the value of the P entry as an unsigned 4-byte integer
- * and pass these bytes to the MD5 hash function, low-order byte
- * first.
- */
- in_buf[0] = (unsigned char)(permission) & 0xFF;
- in_buf[1] = (unsigned char)(permission >> 8) & 0xFF;
- in_buf[2] = (unsigned char)(permission >> 16) & 0xFF;
- in_buf[3] = (unsigned char)(permission >> 24) & 0xFF;
- MD5_write(&md5_ctx, in_buf, 4);
- /*
- * 5. Pass the first element of the file's file identifier array
- * (the value of the ID entry in the document's trailer dictionary;
- * see Table 3.12 on page 68) to the MD5 hash function and
- * finish the hash.
- */
- MD5_write(&md5_ctx, id_string, MAX_KEY_LEN);
- MD5_final(md5_buf, &md5_ctx);
- /*
- * 6. (Revision 3 only) Do the following 50 times; Take the output from
- * the previous MD5 hash and pass it as input into a new MD5 hash.
- */
- if (revision == 3)
+ int i;
+ unsigned char hash[32], padded[32];
+ MD5_CONTEXT md5;
+
+ passwd_padding(passwd, padded);
+ MD5_init (&md5);
+ MD5_write(&md5, padded, 32);
+ MD5_write(&md5, p->O, 32);
+ {
+ unsigned char tmp[4];
+
+ tmp[0] = (unsigned char)(p->P) & 0xFF;
+ tmp[1] = (unsigned char)(p->P >> 8) & 0xFF;
+ tmp[2] = (unsigned char)(p->P >> 16) & 0xFF;
+ tmp[3] = (unsigned char)(p->P >> 24) & 0xFF;
+ MD5_write(&md5, tmp, 4);
+ }
+ MD5_write(&md5, p->ID, 16);
+#if 0
+ /* Not Supported Yet */
+ if (!p->setting.encrypt_metadata) {
+ unsigned char tmp[4] = {0xff, 0xff, 0xff, 0xff};
+ MD5_write(&md5, tmp, 4);
+ }
+#endif
+ MD5_final(hash, &md5);
+
+ if (p->R >= 3) {
for (i = 0; i < 50; i++) {
/*
* NOTE: We truncate each MD5 hash as in the following step.
* Otherwise Adobe Reader won't decrypt the PDF file.
*/
- MD5_init(&md5_ctx);
- MD5_write(&md5_ctx, md5_buf, key_size);
- MD5_final(md5_buf, &md5_ctx);
+ MD5_init (&md5);
+ MD5_write(&md5, hash, p->key_size);
+ MD5_final(hash, &md5);
}
- /*
- * 7. Set the encryption key to the first n bytes of the output from
- * the final MD5 hash, where n is always 5 for revision 2 but for
- * revision 3 depends on the value of the encryption dictionary's
- * Length entry.
- */
- memcpy(key_data, md5_buf, key_size);
+ }
+ memcpy(p->key, hash, p->key_size);
}
-static void compute_user_password (void)
+static void
+compute_user_password (struct pdf_sec *p, const char *uplain)
{
- register unsigned char i, j;
- /*
- * Algorithm 3.4 Computing the encryption dictionary's U (user password)
- * value (Revision 2)
- *
- * 1. Create an encryption key based on the user password string, as
- * described in Algorithm 3.2.
- *
- * 2. Encrypt the 32-byte padding string shown in step 1 of Algorithm
- * 3.2, using an RC4 encryption fuction with the encryption key from
- * the preceeding step.
- *
- * 3. Store the result of step 2 as the value of the U entry in the
- * encryption dictionary.
- */
- /*
- * Algorithm 3.5 Computing the encryption dictionary's U (user password)
- * value (Revision 3)
- *
- * 1. Create an encryption key based on the user password string, as
- * described in Algorithm 3.2.
- *
- * 2. Initialize the MD5 hash function and pass the 32-byte padding
- * string shown in step 1 of Algorithm 3.2 as input to this function.
- *
- * 3. Pass the first element of the file's file identifier array (the
- * value of the ID entry in the document's trailer dictionary; see
- * Table 3.12 on page 68) to the hash function and finish the hash.
- *
- * 4. Encrypt the 16-byte result of the hash, using an RC4 encryption
- * function with the encryption key from step 1.
- *
- * 5. Do the following 19 times: Take the output from the previous
- * invocation of the RC4 function and pass it as input to a new
- * invocation of the function; use an encryption key generated by
- * taking each byte of the original encryption key (obtained in
- * step 1) and performing an XOR (exclusive or) operation between
- * that byte and the single-byte value of the iteration counter
- * (from 1 to 19).
- *
- * 6. Append 16 bytes of arbitrary padding to the output from the
- * final invocation of the RC4 function and store the 32-byte
- * result as the value of the U entry in the encryption dictionary.
- */
- compute_encryption_key((unsigned char *)user_passwd);
+ int i, j;
+ ARC4_CONTEXT arc4;
+ MD5_CONTEXT md5;
+ unsigned char upasswd[32];
+
+ compute_encryption_key(p, uplain);
- switch (revision) {
+ switch (p->R) {
case 2:
- ARC4_set_key(&key, key_size, key_data);
- ARC4(&key, MAX_STR_LEN, padding_string, out_buf);
+ ARC4_set_key(&arc4, p->key_size, p->key);
+ ARC4(&arc4, 32, padding_bytes, upasswd);
break;
- case 3:
- MD5_init(&md5_ctx);
- MD5_write(&md5_ctx, padding_string, MAX_STR_LEN);
+ case 3: case 4:
+ {
+ unsigned char hash[32];
+ unsigned char tmp1[32], tmp2[32];
- MD5_write(&md5_ctx, id_string, MAX_KEY_LEN);
- MD5_final(md5_buf, &md5_ctx);
+ MD5_init (&md5);
+ MD5_write(&md5, padding_bytes, 32);
- ARC4_set_key(&key, key_size, key_data);
- ARC4(&key, MAX_KEY_LEN, md5_buf, out_buf);
+ MD5_write(&md5, p->ID, 16);
+ MD5_final(hash, &md5);
+
+ ARC4_set_key(&arc4, p->key_size, p->key);
+ ARC4(&arc4, 16, hash, tmp1);
for (i = 1; i <= 19; i++) {
- memcpy(in_buf, out_buf, MAX_KEY_LEN);
- for (j = 0; j < key_size; j++)
- key_buf[j] = key_data[j] ^ i;
- ARC4_set_key(&key, key_size, key_buf);
- ARC4(&key, MAX_KEY_LEN, in_buf, out_buf);
+ unsigned char key[16];
+
+ memcpy(tmp2, tmp1, 16);
+ for (j = 0; j < p->key_size; j++)
+ key[j] = p->key[j] ^ i;
+ ARC4_set_key(&arc4, p->key_size, key);
+ ARC4(&arc4, 16, tmp2, tmp1);
+ }
+ memcpy(upasswd, tmp1, 32);
}
break;
default:
- ERROR("Invalid revision number.\n");
+ ERROR("Invalid revision number.");
}
- memcpy(upwd_string, out_buf, MAX_STR_LEN);
+ memcpy(p->U, upasswd, 32);
+}
+
+/* Algorithm 2.B from ISO 32000-1 chapter 7 */
+static void
+compute_hash_V5 (unsigned char *hash,
+ const char *passwd,
+ const unsigned char *salt,
+ const unsigned char *user_key, int R /* revision */)
+{
+ SHA256_CONTEXT sha;
+ unsigned char K[64];
+ size_t K_len;
+ int nround;
+
+ SHA256_init (&sha);
+ SHA256_write(&sha, (const unsigned char *)passwd, strlen(passwd));
+ SHA256_write(&sha, salt, 8);
+ if (user_key)
+ SHA256_write(&sha, user_key, 48);
+ SHA256_final(hash, &sha);
+
+ ASSERT( R ==5 || R == 6 );
+
+ if (R == 5)
+ return;
+
+ memcpy(K, hash, 32); K_len = 32;
+ for (nround = 1; ; nround++) { /* Initial K count as nround 0. */
+ unsigned char K1[256], *Kr, *E;
+ size_t K1_len, E_len;
+ int i, c, E_mod3 = 0;
+
+ K1_len = strlen(passwd) + K_len + (user_key ? 48 : 0);
+ ASSERT(K1_len < 240);
+ memcpy(K1, passwd, strlen(passwd));
+ memcpy(K1 + strlen(passwd), K, K_len);
+ if (user_key)
+ memcpy(K1 + strlen(passwd) + K_len, user_key, 48);
+
+ Kr = NEW(K1_len * 64, unsigned char);
+ for (i = 0; i < 64; i++)
+ memcpy(Kr + i * K1_len, K1, K1_len);
+ AES_cbc_encrypt(K, 16, K + 16, 0, Kr, K1_len * 64, &E, &E_len);
+ RELEASE(Kr);
+
+ for (i = 0; i < 16; i++)
+ E_mod3 += E[i];
+ E_mod3 %= 3;
+
+ switch (E_mod3) {
+ case 0:
+ {
+ SHA256_CONTEXT sha;
+
+ SHA256_init (&sha);
+ SHA256_write(&sha, E, E_len);
+ SHA256_final(K, &sha);
+ K_len = 32;
+ }
+ break;
+ case 1:
+ {
+ SHA512_CONTEXT sha;
+
+ SHA384_init (&sha);
+ SHA384_write(&sha, E, E_len);
+ SHA384_final(K, &sha);
+ K_len = 48;
+ }
+ break;
+ case 2:
+ {
+ SHA512_CONTEXT sha;
+
+ SHA512_init (&sha);
+ SHA512_write(&sha, E, E_len);
+ SHA512_final(K, &sha);
+ K_len = 64;
+ }
+ break;
+ }
+ c = (uint8_t) E[E_len - 1];
+ RELEASE(E);
+ if (nround >= 64 && c <= nround - 32)
+ break;
+ }
+ memcpy(hash, K, 32);
+}
+
+static void
+compute_owner_password_V5 (struct pdf_sec *p, const char *oplain)
+{
+ unsigned char vsalt[8], ksalt[8], hash[32];
+ unsigned char *OE, iv[AES_BLOCKSIZE];
+ size_t OE_len;
+ int i;
+
+ for (i = 0; i < 8 ; i++) {
+ vsalt[i] = rand() % 256;
+ ksalt[i] = rand() % 256;
+ }
+
+ compute_hash_V5(hash, oplain, vsalt, p->U, p->R);
+ memcpy(p->O, hash, 32);
+ memcpy(p->O + 32, vsalt, 8);
+ memcpy(p->O + 40, ksalt, 8);
+
+ compute_hash_V5(hash, oplain, ksalt, p->U, p->R);
+ memset(iv, 0, AES_BLOCKSIZE);
+ AES_cbc_encrypt(hash, 32, iv, 0, p->key, p->key_size, &OE, &OE_len);
+ memcpy(p->OE, OE, 32);
+ RELEASE(OE);
+}
+
+static void
+compute_user_password_V5 (struct pdf_sec *p, const char *uplain)
+{
+ unsigned char vsalt[8], ksalt[8], hash[32];
+ unsigned char *UE, iv[AES_BLOCKSIZE];
+ size_t UE_len;
+ int i;
+
+ for (i = 0; i < 8 ; i++) {
+ vsalt[i] = rand() % 256;
+ ksalt[i] = rand() % 256;
+ }
+
+ compute_hash_V5(hash, uplain, vsalt, NULL, p->R);
+ memcpy(p->U, hash, 32);
+ memcpy(p->U + 32, vsalt, 8);
+ memcpy(p->U + 40, ksalt, 8);
+
+ compute_hash_V5(hash, uplain, ksalt, NULL, p->R);
+ memset(iv, 0, AES_BLOCKSIZE);
+ AES_cbc_encrypt(hash, 32, iv, 0, p->key, p->key_size, &UE, &UE_len);
+ memcpy(p->UE, UE, 32);
+ RELEASE(UE);
}
#ifdef WIN32
-static char *getpass (const char *prompt)
+/* Broken on mintty? */
+static char *
+getpass (const char *prompt)
{
static char pwd_buf[128];
size_t i;
@@ -357,7 +440,7 @@ static char *getpass (const char *prompt)
fflush(stderr);
for (i = 0; i < sizeof(pwd_buf)-1; i++) {
pwd_buf[i] = getch();
- if (pwd_buf[i] == '\r')
+ if (pwd_buf[i] == '\r' || pwd_buf[i] == '\n')
break;
fputs("*", stderr);
fflush(stderr);
@@ -368,172 +451,369 @@ static char *getpass (const char *prompt)
}
#endif
-void pdf_enc_set_passwd (unsigned bits, unsigned perm, const char *owner_pw, const char *user_pw)
+static void
+check_version (struct pdf_sec *p, int version)
+{
+ if (p->V > 2 && version < 4) {
+ WARN("Current encryption setting requires PDF version >= 1.4.");
+ p->V = 1;
+ p->key_size = 5;
+ } else if (p->V == 4 && version < 5) {
+ WARN("Current encryption setting requires PDF version >= 1.5.");
+ p->V = 2;
+ } else if (p->V ==5 && version < 7) {
+ WARN("Current encryption setting requires PDF version >= 1.7" \
+ " (plus Adobe Extension Level 3).");
+ p->V = 4;
+ }
+}
+
+/* Dummy routine for stringprep - NOT IMPLEMENTED YET
+ *
+ * Preprocessing of a user-provided password consists first of
+ * normalizing its representation by applying the "SASLPrep" profile (RFC 4013)
+ * of the "stringprep" algorithm (RFC 3454) to the supplied password using the
+ * Normalize and BiDi options.
+ */
+typedef int Stringprep_profile_flags;
+#define STRINGPREP_OK 0
+#define STRINGPREP_ERROR -1
+static int
+stringprep_profile(const char *input, char **output, const char *profile,
+ Stringprep_profile_flags flags)
+{
+ const char *p, *endptr;
+
+ p = input; endptr = p + strlen(p);
+ while (p < endptr) {
+ int32_t ucv = UC_UTF8_decode_char((const unsigned char **)&p,
+ (const unsigned char *)endptr);
+ if (!UC_is_valid(ucv))
+ return STRINGPREP_ERROR;
+ }
+
+ *output = NEW(strlen(input) + 1, char);
+ strcpy(*output, input);
+
+ (void) profile;
+ (void) flags;
+
+ return STRINGPREP_OK;
+}
+
+static int
+preproc_password (const char *passwd, char *outbuf, int V)
{
+ char *saslpwd = NULL;
+ int error = 0;
+
+ memset(outbuf, 0, 128);
+ switch (V) {
+ case 1: case 2: case 3: case 4:
+ {
+ int i;
+ /* Need to be converted to PDFDocEncoding - UNIMPLEMENTED */
+ for (i = 0; i < strlen(passwd); i++) {
+ if (passwd[i] < 0x20 || passwd[i] > 0x7e)
+ WARN("Non-ASCII-printable character found in password.");
+ }
+ memcpy(outbuf, passwd, MIN(127, strlen(passwd)));
+ }
+ break;
+ case 5:
+ /* This is a dummy routine - not actually stringprep password... */
+ if (stringprep_profile(passwd, &saslpwd,
+ "SASLprep", 0) != STRINGPREP_OK)
+ return -1;
+ else if (saslpwd) {
+ memcpy(outbuf, saslpwd, MIN(127, strlen(saslpwd)));
+ RELEASE(saslpwd);
+ }
+ break;
+ default:
+ error = -1;
+ break;
+ }
+
+ return error;
+}
+
+void
+pdf_enc_set_passwd (unsigned int bits, unsigned int perm,
+ const char *oplain, const char *uplain)
+{
+ struct pdf_sec *p = &sec_data;
+ char input[128], opasswd[128], upasswd[128];
char *retry_passwd;
+ int version;
+
+ version = pdf_get_version();
+
+ p->key_size = (int) (bits / 8);
+ if (p->key_size == 5) /* 40bit */
+ p->V = 1;
+ else if (p->key_size <= 16) {
+ p->V = p->setting.use_aes ? 4 : 2;
+ } else if (p->key_size == 32) {
+ p->V = 5;
+ } else {
+ WARN("Key length %d unsupported.", bits);
+ p->key_size = 5;
+ p->V = 2;
+ }
+ check_version(p, version);
- if (owner_pw) {
- strncpy(owner_passwd, owner_pw, MAX_PWD_LEN);
- } else
+ p->P = (int32_t) (perm | 0xC0U);
+ switch (p->V) {
+ case 1:
+ p->R = (p->P < 0x100L) ? 2 : 3;
+ break;
+ case 2: case 3:
+ p->R = 3;
+ break;
+ case 4:
+ p->R = 4;
+ break;
+ case 5:
+#if USE_ADOBE_EXTENSION
+ p->R = 6;
+#else
+ WARN("Encryption V 5 unsupported.");
+ p->R = 4; p->V = 4;
+#endif
+ break;
+ default:
+ p->R = 3;
+ break;
+ }
+
+ memset(opasswd, 0, 128);
+ memset(upasswd, 0, 128);
+ /* Password must be preprocessed. */
+ if (oplain) {
+ if (preproc_password(oplain, opasswd, p->V) < 0)
+ WARN("Invaid UTF-8 string for password.");
+ } else {
while (1) {
- strncpy(owner_passwd, getpass("Owner password: "), MAX_PWD_LEN);
+ strncpy(input, getpass("Owner password: "), MAX_PWD_LEN);
retry_passwd = getpass("Re-enter owner password: ");
- if (!strncmp(owner_passwd, retry_passwd, MAX_PWD_LEN))
+ if (!strncmp(input, retry_passwd, MAX_PWD_LEN))
break;
fputs("Password is not identical.\nTry again.\n", stderr);
fflush(stderr);
}
-
- if (user_pw) {
- strncpy(user_passwd, user_pw, MAX_PWD_LEN);
- } else
+ if (preproc_password(input, opasswd, p->V) < 0)
+ WARN("Invaid UTF-8 string for password.");
+ }
+ if (uplain) {
+ if (preproc_password(uplain, upasswd, p->V) < 0)
+ WARN("Invalid UTF-8 string for passowrd.");
+ } else {
while (1) {
- strncpy(user_passwd, getpass("User password: "), MAX_PWD_LEN);
+ strncpy(input, getpass("User password: "), MAX_PWD_LEN);
retry_passwd = getpass("Re-enter user password: ");
- if (!strncmp(user_passwd, retry_passwd, MAX_PWD_LEN))
+ if (!strncmp(input, retry_passwd, MAX_PWD_LEN))
break;
fputs("Password is not identical.\nTry again.\n", stderr);
fflush(stderr);
}
+ if (preproc_password(input, upasswd, p->V) < 0)
+ WARN("Invaid UTF-8 string for password.");
+ }
- key_size = (unsigned char)(bits / 8);
- algorithm = (key_size == 5 ? 1 : 2);
- permission = (long) (perm | 0xC0U);
- revision = ((algorithm == 1 && permission < 0x100L) ? 2 : 3);
- if (revision == 3)
- permission |= ~0xFFFL;
+ if (p->R >= 3)
+ p->P |= 0xFFFFF000U;
+
+ if (p->V < 5) {
+ compute_owner_password(p, opasswd, upasswd);
+ compute_user_password (p, upasswd);
+ } else if (p->V == 5) {
+ int i;
+
+ for (i = 0; i < 32; i++)
+ p->key[i] = rand() % 256;
+ p->key_size = 32;
+ /* Order is important here */
+ compute_user_password_V5 (p, upasswd);
+ compute_owner_password_V5(p, opasswd); /* uses p->U */
+ }
+}
- compute_owner_password();
- compute_user_password();
+static void
+calculate_key (struct pdf_sec *p, unsigned char *key)
+{
+ int len = p->key_size + 5;
+ unsigned char tmp[25];
+ MD5_CONTEXT md5;
+
+ memcpy(tmp, p->key, p->key_size);
+ tmp[p->key_size ] = (unsigned char) p->label.objnum & 0xFF;
+ tmp[p->key_size+1] = (unsigned char)(p->label.objnum >> 8) & 0xFF;
+ tmp[p->key_size+2] = (unsigned char)(p->label.objnum >> 16) & 0xFF;
+ tmp[p->key_size+3] = (unsigned char)(p->label.gennum) & 0xFF;
+ tmp[p->key_size+4] = (unsigned char)(p->label.gennum >> 8) & 0xFF;
+ if (p->V >= 4) {
+ tmp[p->key_size + 5] = 0x73;
+ tmp[p->key_size + 6] = 0x41;
+ tmp[p->key_size + 7] = 0x6c;
+ tmp[p->key_size + 8] = 0x54;
+ len += 4;
+ }
+ MD5_init (&md5);
+ MD5_write(&md5, tmp, len);
+ MD5_final(key, &md5);
}
-void pdf_encrypt_data (unsigned char *data, unsigned long len)
+void
+pdf_encrypt_data (const unsigned char *plain, size_t plain_len,
+ unsigned char **cipher, size_t *cipher_len)
{
- unsigned char *result;
-
- memcpy(in_buf, key_data, key_size);
- in_buf[key_size] = (unsigned char)(current_label) & 0xFF;
- in_buf[key_size+1] = (unsigned char)(current_label >> 8) & 0xFF;
- in_buf[key_size+2] = (unsigned char)(current_label >> 16) & 0xFF;
- in_buf[key_size+3] = (unsigned char)(current_generation) & 0xFF;
- in_buf[key_size+4] = (unsigned char)(current_generation >> 8) & 0xFF;
-
- MD5_init(&md5_ctx);
- MD5_write(&md5_ctx, in_buf, key_size+5);
- MD5_final(md5_buf, &md5_ctx);
-
- result = NEW (len, unsigned char);
- ARC4_set_key(&key, (key_size > 10 ? MAX_KEY_LEN : key_size+5), md5_buf);
- ARC4(&key, len, data, result);
- memcpy(data, result, len);
- RELEASE (result);
+ struct pdf_sec *p = &sec_data;
+ unsigned char key[32];
+
+ switch (p->V) {
+ case 1: case 2:
+ calculate_key(p, key);
+ {
+ ARC4_CONTEXT arc4;
+
+ *cipher_len = plain_len;
+ *cipher = NEW(*cipher_len, unsigned char);
+ ARC4_set_key(&arc4, MIN(16, p->key_size + 5), key);
+ ARC4(&arc4, plain_len, plain, *cipher);
+ }
+ break;
+ case 4:
+ calculate_key(p, key);
+ AES_cbc_encrypt(key, MIN(16, p->key_size + 5), NULL, 1,
+ plain, plain_len, cipher, cipher_len);
+ break;
+ case 5:
+ AES_cbc_encrypt(p->key, p->key_size, NULL, 1,
+ plain, plain_len, cipher, cipher_len);
+ break;
+ default:
+ ERROR("pdfencrypt: Unexpected V value: %d", p->V);
+ break;
+ }
}
-pdf_obj *pdf_encrypt_obj (void)
+pdf_obj *
+pdf_encrypt_obj (void)
{
+ struct pdf_sec *p = &sec_data;
pdf_obj *doc_encrypt;
-#ifdef DEBUG
- fprintf (stderr, "(pdf_encrypt_obj)");
-#endif
-
- doc_encrypt = pdf_new_dict ();
+ doc_encrypt = pdf_new_dict();
- /* KEY : Filter
- * TYPE : name
- * VALUE: (Required) The name of the security handler for this document;
- * see below. Default value: Standard, for the built-in security
- * handler.
- */
- pdf_add_dict (doc_encrypt,
- pdf_new_name ("Filter"),
- pdf_new_name ("Standard"));
- /* KEY : V
- * TYPE : number
- * VALUE: (Optional but strongly recommended) A code specifying the
- * algorithm to be used in encrypting and decrypting the document:
- * 0 An algorithm that is undocumented and no longer supported,
- * and whose use is strongly discouraged.
- * 1 Algorithm 3.1 on page 73, with an encryption key length
- * of 40 bits; see below.
- * 2 (PDF 1.4) Algorithm 3.1 on page 73, but allowing encryption
- * key lengths greater than 40 bits.
- * 3 (PDF 1.4) An unpublished algorithm allowing encryption key
- * lengths ranging from 40 to 128 bits. (This algorithm is
- * unpublished as an export requirement of the U.S. Department
- * of Commerce.)
- * The default value if this entry is omitted is 0, but a value
- * of 1 or greater is strongly recommended.
- */
- pdf_add_dict (doc_encrypt,
- pdf_new_name ("V"),
- pdf_new_number (algorithm));
- /* KEY : Length
- * TYPE : integer
- * VALUE: (Optional; PDF 1.4; only if V is 2 or 3) The length of the
- * encryption key, in bits. The value must be a multiple of 8,
- * in the range 40 to 128. Default value: 40.
- */
- if (algorithm > 1)
- pdf_add_dict (doc_encrypt,
- pdf_new_name ("Length"),
- pdf_new_number (key_size * 8));
- /* KEY : R
- * TYPE : number
- * VALUE: (Required) A number specifying which revision of the standard
- * security handler should be used to interpret this dictionary.
- * The revison number should be 2 if the document is encrypted
- * with a V value less than 2; otherwise this value should be 3.
- */
- pdf_add_dict (doc_encrypt,
- pdf_new_name ("R"),
- pdf_new_number (revision));
- /* KEY : O
- * TYPE : string
- * VALUE: (Required) A 32-byte string, based on both the owner and
- * user passwords, that is used in computing the encryption
- * key and in determining whether a valid owner password was
- * entered.
- */
- pdf_add_dict (doc_encrypt,
- pdf_new_name ("O"),
- pdf_new_string (opwd_string, 32));
- /* KEY : U
- * TYPE : string
- * VALUE: (Required) A 32-byte string, based on the user password,
- * that is used in determining whether to prompt the user
- * for a password and, if so, whether a valid user or owner
- * password was entered.
- */
- pdf_add_dict (doc_encrypt,
- pdf_new_name ("U"),
- pdf_new_string (upwd_string, 32));
- /* KEY : P
- * TYPE : (signed 32 bit) integer
- * VALUE: (Required) A set of flags specifying which operations are
- * permitted when the document is opened with user access.
+ pdf_add_dict(doc_encrypt, pdf_new_name("Filter"), pdf_new_name("Standard"));
+ pdf_add_dict(doc_encrypt, pdf_new_name("V"), pdf_new_number(p->V));
+#if 0
+ /* PDF reference describes it as:
+ *
+ * (Optional; PDF 1.4; only if V is 2 or 3)
+ *
+ * but Acrobat *requires* this even for V 5!
*/
- pdf_add_dict (doc_encrypt,
- pdf_new_name ("P"),
- pdf_new_number (permission));
+ if (p->V > 1 && p->V < 4)
+#endif
+ pdf_add_dict(doc_encrypt,
+ pdf_new_name("Length"), pdf_new_number(p->key_size * 8));
+ if (p->V >= 4) {
+ pdf_obj *CF, *StdCF;
+ CF = pdf_new_dict();
+ StdCF = pdf_new_dict();
+ pdf_add_dict(StdCF, pdf_new_name("CFM"),
+ pdf_new_name( (p->V == 4) ? "AESV2" : "AESV3" ));
+ pdf_add_dict(StdCF, pdf_new_name("AuthEvent"), pdf_new_name("DocOpen"));
+ pdf_add_dict(StdCF, pdf_new_name("Length"), pdf_new_number(p->key_size));
+ pdf_add_dict(CF, pdf_new_name("StdCF"), StdCF);
+ pdf_add_dict(doc_encrypt, pdf_new_name("CF"), CF);
+ pdf_add_dict(doc_encrypt, pdf_new_name("StmF"), pdf_new_name("StdCF"));
+ pdf_add_dict(doc_encrypt, pdf_new_name("StrF"), pdf_new_name("StdCF"));
+#if 0
+ /* NOT SUPPORTED YET */
+ if (!p->setting.encrypt_metadata)
+ pdf_add_dict(doc_encrypt,
+ pdf_new_name("EncryptMetadata"), pdf_new_boolean(false));
+#endif
+ }
+ pdf_add_dict(doc_encrypt, pdf_new_name("R"), pdf_new_number(p->R));
+ if (p->V < 5) {
+ pdf_add_dict(doc_encrypt, pdf_new_name("O"), pdf_new_string(p->O, 32));
+ pdf_add_dict(doc_encrypt, pdf_new_name("U"), pdf_new_string(p->U, 32));
+ } else if (p->V == 5) {
+ pdf_add_dict(doc_encrypt, pdf_new_name("O"), pdf_new_string(p->O, 48));
+ pdf_add_dict(doc_encrypt, pdf_new_name("U"), pdf_new_string(p->U, 48));
+ }
+ pdf_add_dict(doc_encrypt, pdf_new_name("P"), pdf_new_number(p->P));
+
+ if (p->V == 5) {
+ unsigned char perms[16], *cipher = NULL;
+ size_t cipher_len = 0;
+
+ pdf_add_dict(doc_encrypt, pdf_new_name("OE"), pdf_new_string(p->OE, 32));
+ pdf_add_dict(doc_encrypt, pdf_new_name("UE"), pdf_new_string(p->UE, 32));
+ perms[0] = p->P & 0xff;
+ perms[1] = (p->P >> 8) & 0xff;
+ perms[2] = (p->P >> 16) & 0xff;
+ perms[3] = (p->P >> 24) & 0xff;
+ perms[4] = 0xff;
+ perms[5] = 0xff;
+ perms[6] = 0xff;
+ perms[7] = 0xff;
+ perms[8] = p->setting.encrypt_metadata ? 'T' : 'F';
+ perms[9] = 'a';
+ perms[10] = 'd';
+ perms[11] = 'b';
+ perms[12] = 0;
+ perms[13] = 0;
+ perms[14] = 0;
+ perms[15] = 0;
+ AES_ecb_encrypt(p->key, p->key_size, perms, 16, &cipher, &cipher_len);
+ pdf_add_dict(doc_encrypt,
+ pdf_new_name("Perms"), pdf_new_string(cipher, cipher_len));
+ RELEASE(cipher);
+ }
+
+#ifdef USE_ADOBE_EXTENSION
+ if (p->R > 5) {
+ pdf_obj *catalog = pdf_doc_catalog();
+ pdf_obj *ext = pdf_new_dict();
+ pdf_obj *adbe = pdf_new_dict();
+
+ pdf_add_dict(adbe, pdf_new_name("BaseVersion"), pdf_new_name("1.7"));
+ pdf_add_dict(adbe, pdf_new_name("ExtensionLevel"),
+ pdf_new_number(p->R == 5 ? 3 : 8));
+ pdf_add_dict(ext, pdf_new_name("ADBE"), adbe);
+ pdf_add_dict(catalog, pdf_new_name("Extensions"), ext);
+ }
+#endif
return doc_encrypt;
}
pdf_obj *pdf_enc_id_array (void)
{
+ struct pdf_sec *p = &sec_data;
pdf_obj *id = pdf_new_array();
- pdf_add_array(id, pdf_new_string(id_string, MAX_KEY_LEN));
- pdf_add_array(id, pdf_new_string(id_string, MAX_KEY_LEN));
+
+ pdf_add_array(id, pdf_new_string(p->ID, 16));
+ pdf_add_array(id, pdf_new_string(p->ID, 16));
+
return id;
}
void pdf_enc_set_label (unsigned long label)
{
- current_label = label;
+ struct pdf_sec *p = &sec_data;
+
+ p->label.objnum = label;
}
void pdf_enc_set_generation (unsigned generation)
{
- current_generation = generation;
+ struct pdf_sec *p = &sec_data;
+
+ p->label.gennum = generation;
}
diff --git a/Build/source/texk/dvipdfm-x/pdfencrypt.h b/Build/source/texk/dvipdfm-x/pdfencrypt.h
index 6823e7718d5..e6ad17737b5 100644
--- a/Build/source/texk/dvipdfm-x/pdfencrypt.h
+++ b/Build/source/texk/dvipdfm-x/pdfencrypt.h
@@ -25,15 +25,17 @@
#include "pdfobj.h"
-#define MAX_PWD_LEN 128
+#define MAX_PWD_LEN 127
extern void pdf_enc_set_verbose (void);
extern pdf_obj *pdf_enc_id_array (void);
extern void pdf_enc_compute_id_string (char *dviname, char *pdfname);
extern void pdf_enc_set_label (unsigned long label);
extern void pdf_enc_set_generation (unsigned generation);
-extern void pdf_enc_set_passwd (unsigned size, unsigned perm, const char *owner, const char *user);
-extern void pdf_encrypt_data (unsigned char *data, unsigned long len);
+extern void pdf_enc_set_passwd (unsigned int size, unsigned int perm,
+ const char *owner, const char *user);
+extern void pdf_encrypt_data (const unsigned char *plain, size_t plain_len,
+ unsigned char **cipher, size_t *cipher_len);
extern pdf_obj *pdf_encrypt_obj (void);
#endif /* _PDFENCRYPT_H_ */
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c
index bdb01e4b16e..406ab103c6c 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.c
+++ b/Build/source/texk/dvipdfm-x/pdfobj.c
@@ -939,19 +939,22 @@ pdfobj_escape_str (char *buffer, int bufsize, const unsigned char *s, int len)
static void
write_string (pdf_string *str, FILE *file)
{
- unsigned char *s;
+ unsigned char *s = NULL;
char wbuf[FORMAT_BUF_SIZE]; /* Shouldn't use format_buffer[]. */
int nescc = 0, i, count;
+ size_t len = 0;
+ if (enc_mode) {
+ pdf_encrypt_data(str->string, str->length, &s, &len);
+ } else {
s = str->string;
-
- if (enc_mode)
- pdf_encrypt_data(s, str->length);
+ len = str->length;
+ }
/*
* Count all ASCII non-printable characters.
*/
- for (i = 0; i < str->length; i++) {
+ for (i = 0; i < len; i++) {
if (!isprint(s[i]))
nescc++;
}
@@ -959,9 +962,9 @@ write_string (pdf_string *str, FILE *file)
* If the string contains much escaped chars, then we write it as
* ASCII hex string.
*/
- if (nescc > str->length / 3) {
+ if (nescc > len / 3) {
pdf_out_char(file, '<');
- for (i = 0; i < str->length; i++) {
+ for (i = 0; i < len; i++) {
pdf_out_xchar(file, s[i]);
}
pdf_out_char(file, '>');
@@ -975,12 +978,14 @@ write_string (pdf_string *str, FILE *file)
* is also used for strings of text with no kerning. These must be
* handled as quickly as possible since there are so many of them.
*/
- for (i = 0; i < str->length; i++) {
+ for (i = 0; i < len; i++) {
count = pdfobj_escape_str(wbuf, FORMAT_BUF_SIZE, &(s[i]), 1);
pdf_out(file, wbuf, count);
}
pdf_out_char(file, ')');
}
+ if (enc_mode && s)
+ RELEASE(s);
}
static void
@@ -1640,7 +1645,17 @@ write_stream (pdf_stream *stream, FILE *file)
}
#endif /* HAVE_ZLIB */
-#if 0
+ /* AES will change the size of data! */
+ if (enc_mode) {
+ unsigned char *cipher = NULL;
+ size_t cipher_len = 0;
+ pdf_encrypt_data(filtered, filtered_length, &cipher, &cipher_len);
+ RELEASE(filtered);
+ filtered = cipher;
+ filtered_length = cipher_len;
+ }
+
+ #if 0
/*
* An optional end-of-line marker preceding the "endstream" is
* not part of stream data. See, PDF Reference 4th ed., p. 38.
@@ -1652,6 +1667,7 @@ write_stream (pdf_stream *stream, FILE *file)
filtered_length++;
}
#endif
+
pdf_add_dict(stream->dict,
pdf_new_name("Length"), pdf_new_number(filtered_length));
@@ -1659,12 +1675,8 @@ write_stream (pdf_stream *stream, FILE *file)
pdf_out(file, "\nstream\n", 8);
- if (enc_mode)
- pdf_encrypt_data(filtered, filtered_length);
-
- if (filtered_length > 0) {
+ if (filtered_length > 0)
pdf_out(file, filtered, filtered_length);
- }
RELEASE(filtered);
/*
diff --git a/Build/source/texk/dvipdfm-x/pngimage.c b/Build/source/texk/dvipdfm-x/pngimage.c
index 979ab06a220..5237e169ed7 100644
--- a/Build/source/texk/dvipdfm-x/pngimage.c
+++ b/Build/source/texk/dvipdfm-x/pngimage.c
@@ -20,6 +20,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -27,21 +28,13 @@
/*
* PNG SUPPORT
*
- * All bitdepth less than 16 is supported.
+ * All bitdepth supported.
* Supported color types are: PALETTE, RGB, GRAY, RGB_ALPHA, GRAY_ALPHA.
* Supported ancillary chunks: tRNS, cHRM, gAMA, (sRGB), (iCCP)
*
* cHRM support is not tested well. CalRGB/CalGray colorspace is used for
* PNG images that have cHRM chunk.
*
- * LIMITATIONS
- *
- * Recent version of PDF (>= 1.5) support 16 bpc, but 16 bit bitdepth PNG
- * images are automatically converted to 8 bit bitpedth image.
- *
- * TODO
- * 16 bpc support for PDF-1.5. JBIG compression for monochrome image.
- * Predictor for deflate ?
*/
#include "system.h"
@@ -64,10 +57,6 @@
#define PNG_NO_WRITE_SUPPORTED
#define PNG_NO_MNG_FEATURES
#define PNG_NO_PROGRESSIVE_READ
-#if 0
-/* 16_TO_8 required. */
-#define PNG_NO_READ_TRANSFORMS
-#endif
#include <png.h>
#include "pngimage.h"
@@ -197,11 +186,14 @@ png_include_image (pdf_ximage *ximage, FILE *png_file)
height = png_get_image_height(png_ptr, png_info_ptr);
bpc = png_get_bit_depth (png_ptr, png_info_ptr);
- /* We do not need 16-bpc color. Ask libpng to convert down to 8-bpc. */
+ /* Ask libpng to convert down to 8-bpc. */
if (bpc > 8) {
+ if (pdf_get_version() < 5) {
+ WARN("%s: 16-bpc PNG requires PDF version 1.5.", PNG_DEBUG_STR);
png_set_strip_16(png_ptr);
bpc = 8;
}
+ }
/* Ask libpng to gamma-correct.
* It is wrong to assume screen gamma value 2.2 but...
* We do gamma correction here only when uncalibrated color space is used.
@@ -209,7 +201,6 @@ png_include_image (pdf_ximage *ximage, FILE *png_file)
if (!png_get_valid(png_ptr, png_info_ptr, PNG_INFO_iCCP) &&
!png_get_valid(png_ptr, png_info_ptr, PNG_INFO_sRGB) &&
!png_get_valid(png_ptr, png_info_ptr, PNG_INFO_cHRM) &&
- !png_get_valid(png_ptr, png_info_ptr, PNG_INFO_sRGB) &&
png_get_valid(png_ptr, png_info_ptr, PNG_INFO_gAMA)) {
double G = 1.0;
png_get_gAMA (png_ptr, png_info_ptr, &G);
@@ -996,19 +987,21 @@ strip_soft_mask (png_structp png_ptr, png_infop info_ptr,
png_uint_32 width, png_uint_32 height)
{
pdf_obj *smask, *dict;
- png_byte color_type;
+ png_byte color_type, bpc;
png_bytep smask_data_ptr;
png_uint_32 i;
color_type = png_get_color_type(png_ptr, info_ptr);
-
+ bpc = png_get_bit_depth (png_ptr, info_ptr);
if (color_type & PNG_COLOR_MASK_COLOR) {
- if (*rowbytes_ptr != 4*width*sizeof(png_byte)) { /* Something wrong */
+ int bps = (bpc == 8) ? 4 : 8;
+ if (*rowbytes_ptr != bps*width*sizeof(png_byte)) { /* Something wrong */
WARN("%s: Inconsistent rowbytes value.", PNG_DEBUG_STR);
return NULL;
}
} else {
- if (*rowbytes_ptr != 2*width*sizeof(png_byte)) { /* Something wrong */
+ int bps = (bpc == 8) ? 2 : 4;
+ if (*rowbytes_ptr != bps*width*sizeof(png_byte)) { /* Something wrong */
WARN("%s: Inconsistent rowbytes value.", PNG_DEBUG_STR);
return NULL;
}
@@ -1021,24 +1014,43 @@ strip_soft_mask (png_structp png_ptr, png_infop info_ptr,
pdf_add_dict(dict, pdf_new_name("Width"), pdf_new_number(width));
pdf_add_dict(dict, pdf_new_name("Height"), pdf_new_number(height));
pdf_add_dict(dict, pdf_new_name("ColorSpace"), pdf_new_name("DeviceGray"));
- pdf_add_dict(dict, pdf_new_name("BitsPerComponent"), pdf_new_number(8));
+ pdf_add_dict(dict, pdf_new_name("BitsPerComponent"), pdf_new_number(bpc));
- smask_data_ptr = (png_bytep) NEW(width*height, png_byte);
+ smask_data_ptr = (png_bytep) NEW((bpc/8)*width*height, png_byte);
switch (color_type) {
case PNG_COLOR_TYPE_RGB_ALPHA:
+ if (bpc == 8) {
for (i = 0; i < width*height; i++) {
memmove(image_data_ptr+(3*i), image_data_ptr+(4*i), 3);
smask_data_ptr[i] = image_data_ptr[4*i+3];
}
*rowbytes_ptr = 3*width*sizeof(png_byte);
+ } else {
+ for (i = 0; i < width*height; i++) {
+ memmove(image_data_ptr+(6*i), image_data_ptr+(8*i), 6);
+ smask_data_ptr[2*i] = image_data_ptr[8*i+6];
+ smask_data_ptr[2*i+1] = image_data_ptr[8*i+7];
+ }
+ *rowbytes_ptr = 6*width*sizeof(png_byte);
+ }
break;
case PNG_COLOR_TYPE_GRAY_ALPHA:
+ if (bpc == 8) {
for (i = 0; i < width*height; i++) {
image_data_ptr[i] = image_data_ptr[2*i];
smask_data_ptr[i] = image_data_ptr[2*i+1];
}
*rowbytes_ptr = width*sizeof(png_byte);
+ } else {
+ for (i = 0; i < width*height; i++) {
+ image_data_ptr[2*i] = image_data_ptr[4*i];
+ image_data_ptr[2*i+1] = image_data_ptr[4*i+1];
+ smask_data_ptr[2*i] = image_data_ptr[4*i+2];
+ smask_data_ptr[2*i+1] = image_data_ptr[4*i+3];
+ }
+ *rowbytes_ptr = 2*width*sizeof(png_byte);
+ }
break;
default:
WARN("You found a bug in pngimage.c!");
@@ -1047,7 +1059,7 @@ strip_soft_mask (png_structp png_ptr, png_infop info_ptr,
return NULL;
}
- pdf_add_stream(smask, smask_data_ptr, width*height);
+ pdf_add_stream(smask, smask_data_ptr, (bpc/8)*width*height);
RELEASE(smask_data_ptr);
return smask;
diff --git a/Build/source/texk/dvipdfm-x/unicode.c b/Build/source/texk/dvipdfm-x/unicode.c
index 10ecf17384f..a1bb934db6c 100644
--- a/Build/source/texk/dvipdfm-x/unicode.c
+++ b/Build/source/texk/dvipdfm-x/unicode.c
@@ -103,3 +103,44 @@ UC_is_valid (long ucv)
return 1;
}
+int32_t
+UC_UTF8_decode_char (const unsigned char **pp, const unsigned char *endptr)
+{
+ const unsigned char *p = *pp;
+ int32_t ucv;
+ unsigned char c = *p++;
+ int nbytes;
+
+ if (c <= 0x7f) {
+ ucv = c;
+ nbytes = 0;
+ } else if ((c & 0xe0) == 0xc0) { /* 110x xxxx */
+ ucv = c & 31;
+ nbytes = 1;
+ } else if ((c & 0xf0) == 0xe0) { /* 1110 xxxx */
+ ucv = c & 0x0f;
+ nbytes = 2;
+ } else if ((c & 0xf8) == 0xf0) { /* 1111 0xxx */
+ ucv = c & 0x07;
+ nbytes = 3;
+ } else if ((c & 0xfc) == 0xf8) { /* 1111 10xx */
+ ucv = c & 0x03;
+ nbytes = 4;
+ } else if ((c & 0xfe) == 0xfc) { /* 1111 110x */
+ ucv = c & 0x01;
+ nbytes = 5;
+ } else {
+ return -1;
+ }
+ if (p + nbytes > endptr)
+ return -1;
+ while (nbytes-- > 0) {
+ c = *p++;
+ if ((c & 0xc0) != 0x80)
+ return -1;
+ ucv = (ucv << 6) | (c & 0x3f);
+ }
+
+ *pp = p;
+ return ucv;
+}
diff --git a/Build/source/texk/dvipdfm-x/unicode.h b/Build/source/texk/dvipdfm-x/unicode.h
index a4b98cb3616..36c7b61a977 100644
--- a/Build/source/texk/dvipdfm-x/unicode.h
+++ b/Build/source/texk/dvipdfm-x/unicode.h
@@ -23,9 +23,11 @@
#ifndef _UNICODE_H_
#define _UNICODE_H_
+#include <inttypes.h>
+
extern void UC_set_verbose (void);
extern int UC_sput_UTF16BE (long ucv, unsigned char **dstpp, unsigned char *endptr);
extern int UC_is_valid (long ucv);
-
+extern int32_t UC_UTF8_decode_char(const unsigned char **pp, const unsigned char *endptr);
#endif /* _UNICODE_H_ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 06:28:41 +0000