Implement support for AES encryption.

14 files changed, 1833 insertions, 492 deletions

diff --git a/apps/common/pdfapp.c b/apps/common/pdfapp.c
index b24cec3d..bfe09546 100644
--- a/apps/common/pdfapp.c
+++ b/apps/common/pdfapp.c
@@ -91,23 +91,23 @@ void pdfapp_open(pdfapp_t *app, char *filename)
 		pdfapp_error(app, error);
 	}
 
-	/*
-	 * Handle encrypted PDF files
-	 */
-
 	error = pdf_decryptxref(app->xref);
 	if (error)
 		pdfapp_error(app, error);
 
-	if (app->xref->crypt)
+	/*
+	 * Handle encrypted PDF files
+	 */
+
+	if (pdf_needspassword(app->xref))
 	{
-		int okay = pdf_setpassword(app->xref->crypt, password);
+		int okay = pdf_authenticatepassword(app->xref, password);
 		while (!okay)
 		{
 			password = winpassword(app, filename);
 			if (!password)
 				exit(1);
-			okay = pdf_setpassword(app->xref->crypt, password);
+			okay = pdf_authenticatepassword(app->xref, password);
 			if (!okay)
 				pdfapp_warn(app, "Invalid password.");
 		}
diff --git a/apps/common/pdftool.c b/apps/common/pdftool.c
index 5de9e1b6..025dcd9b 100644
--- a/apps/common/pdftool.c
+++ b/apps/common/pdftool.c
@@ -50,9 +50,9 @@ void openxref(char *filename, char *password, int dieonbadpass)
 	if (error)
 		die(error);
 
-	if (xref->crypt)
+	if (pdf_needspassword(xref))
 	{
-		okay = pdf_setpassword(xref->crypt, password);
+		okay = pdf_authenticatepassword(xref, password);
 		if (!okay && !dieonbadpass)
 			fz_warn("invalid password, attempting to continue.");
 		else if (!okay && dieonbadpass)
diff --git a/apps/mozilla/moz_main.c b/apps/mozilla/moz_main.c
index 569d48a4..ba55ba90 100644
--- a/apps/mozilla/moz_main.c
+++ b/apps/mozilla/moz_main.c
@@ -72,8 +72,6 @@ void pdfmoz_open(pdfmoz_t *moz, char *filename)
     SCROLLINFO si;
     fz_error error;
     fz_obj *obj;
-    char *password = "";
-    pdf_pagetree *pages;
     fz_irect bbox;
     int rot;
     int i;
@@ -110,19 +108,24 @@ void pdfmoz_open(pdfmoz_t *moz, char *filename)
     if (error)
 	pdfmoz_error(moz, error);
 
-    if (moz->xref->crypt)
+    if (pdf_needspassword(moz->xref))
     {
-	int okay = pdf_setpassword(moz->xref->crypt, password);
-	if (!okay)
-	    pdfmoz_warn(moz, "Invalid password.");
+	pdfmoz_warn(moz, "PDF file is encrypted and needs a password.");
     }
 
-    moz->pagecount = moz->xrex->pagecount;
+    error = pdf_getpagecount(moz->xref, &moz->pagecount);
+    if (error)
+	pdfmoz_error(moz, fz_throw("Cannot get page count."));
+
     moz->pages = fz_malloc(sizeof(page_t) * moz->pagecount);
 
     for (i = 0; i < moz->pagecount; i++)
     {
-	moz->pages[i].obj = fz_keepobj(pdf_getpageobject(pages, i));
+	fz_obj *pageobj;
+	error = pdf_getpageobject(moz->xref, i, &pageobj);
+	if (error)
+		pdfmoz_error(moz, fz_throw("cannot load page object"));
+	moz->pages[i].obj = fz_keepobj(pageobj);
 	moz->pages[i].page = nil;
 	moz->pages[i].image = nil;
 
@@ -144,8 +147,6 @@ void pdfmoz_open(pdfmoz_t *moz, char *filename)
 	moz->pages[i].px = 1 + PAD;
     }
 
-    pdf_droppagetree(pages);
-
     /*
      * Load meta information
      * TODO: move this into mupdf library
diff --git a/apps/pdfclean.c b/apps/pdfclean.c
index 77da8f9b..7db29e0c 100644
--- a/apps/pdfclean.c
+++ b/apps/pdfclean.c
@@ -9,7 +9,6 @@
 
 #include "pdftool.h"
 
-static pdf_crypt *outcrypt = NULL;
 static FILE *out = NULL;
 
 static char *uselist = NULL;
diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c
index dcd65dc9..ab244ec3 100644
--- a/apps/pdfinfo.c
+++ b/apps/pdfinfo.c
@@ -199,7 +199,7 @@ gatherglobalinfo(void)
 		if (!fz_isdict(cryptinfo->ref) && !fz_isindirect(cryptinfo->ref))
 			die(fz_throw("not an indirect crypt object"));
 
-		cryptinfo->u.crypt.obj = xref->crypt->encrypt;
+		// XXX cryptinfo->u.crypt.obj = xref->crypt->encrypt;
 	}
 }
 
diff --git a/apps/windows/winmain.c b/apps/windows/winmain.c
index 657be9d4..f278b199 100644
--- a/apps/windows/winmain.c
+++ b/apps/windows/winmain.c
@@ -21,7 +21,7 @@ static LRESULT CALLBACK frameproc(HWND, UINT, WPARAM, LPARAM);
 static LRESULT CALLBACK viewproc(HWND, UINT, WPARAM, LPARAM);
 
 static int bmpstride = 0;
-static char *bmpdata = NULL;
+static unsigned char *bmpdata = NULL;
 static int justcopied = 0;
 
 static pdfapp_t gapp;
@@ -199,12 +199,13 @@ dloginfoproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
 	SetDlgItemTextA(hwnd, 0x10, gapp.filename);
 
-	sprintf(buf, "PDF %g", xref->version);
+	sprintf(buf, "PDF %d.%d", xref->version / 10, xref->version % 10);
 	SetDlgItemTextA(hwnd, 0x11, buf);
 
 	if (xref->crypt)
 	{
-	    sprintf(buf, "Standard %d bit RC4", xref->crypt->len * 8);
+	    sprintf(buf, "Standard %d bit %s", xref->crypt->length,
+		    xref->crypt->strf.method == PDF_CRYPT_AESV2 ? "AES" : "RC4");
 	    SetDlgItemTextA(hwnd, 0x12, buf);
 	    strcpy(buf, "");
 	    if (xref->crypt->p & (1 << 2))
@@ -423,8 +424,8 @@ void winconvert(pdfapp_t *app, fz_pixmap *image)
 
     for (y = 0; y < image->h; y++)
     {
-	char *p = bmpdata + y * bmpstride;
-	char *s = image->samples + y * image->w * 4;
+	unsigned char *p = bmpdata + y * bmpstride;
+	unsigned char *s = image->samples + y * image->w * 4;
 	for (x = 0; x < image->w; x++)
 	{
 	    p[x * 3 + 0] = s[x * 4 + 3];
diff --git a/fitz/Jamfile b/fitz/Jamfile
index 57a0313f..4ca443fd 100644
--- a/fitz/Jamfile
+++ b/fitz/Jamfile
@@ -34,6 +34,7 @@ if $(OS) = NT
 
 Library libfitz :
 
+	crypt_aes.c
 	crypt_arc4.c
 	crypt_crc32.c
 	crypt_md5.c
@@ -51,7 +52,9 @@ Library libfitz :
 	stm_misc.c
 
 	filt_pipeline.c
+	filt_copy.c
 	filt_arc4.c
+	filt_aesd.c
 	filt_null.c
 
 	filt_a85d.c
diff --git a/fitz/crypt_aes.c b/fitz/crypt_aes.c
new file mode 100644
index 00000000..8f706813
--- /dev/null
+++ b/fitz/crypt_aes.c
@@ -0,0 +1,1100 @@
+/*
+ *  FIPS-197 compliant AES implementation
+ *
+ *  Copyright (C) 2006-2007  Christophe Devine
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *    * Redistributions of source code _must_ retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form may or may not reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials provided
+ *      with the distribution.
+ *    * Neither the name of XySSL nor the names of its contributors may be
+ *      used to endorse or promote products derived from this software
+ *      without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ *  The AES block cipher was designed by Vincent Rijmen and Joan Daemen.
+ *
+ *  http://csrc.nist.gov/encryption/aes/rijndael/Rijndael.pdf
+ *  http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
+ */
+
+#include "fitz_base.h"
+#include "fitz_stream.h"
+
+#define aes_context fz_aes
+
+/* AES block cipher implementation from XYSSL */
+
+/*
+ * 32-bit integer manipulation macros (little endian)
+ */
+#ifndef GET_ULONG_LE
+#define GET_ULONG_LE(n,b,i)                             \
+{                                                       \
+    (n) = ( (unsigned long) (b)[(i)    ]       )        \
+        | ( (unsigned long) (b)[(i) + 1] <<  8 )        \
+        | ( (unsigned long) (b)[(i) + 2] << 16 )        \
+        | ( (unsigned long) (b)[(i) + 3] << 24 );       \
+}
+#endif
+
+#ifndef PUT_ULONG_LE
+#define PUT_ULONG_LE(n,b,i)                             \
+{                                                       \
+    (b)[(i)    ] = (unsigned char) ( (n)       );       \
+    (b)[(i) + 1] = (unsigned char) ( (n) >>  8 );       \
+    (b)[(i) + 2] = (unsigned char) ( (n) >> 16 );       \
+    (b)[(i) + 3] = (unsigned char) ( (n) >> 24 );       \
+}
+#endif
+
+#if defined(XYSSL_AES_ROM_TABLES)
+/*
+ * Forward S-box
+ */
+static const unsigned char FSb[256] =
+{
+    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5,
+    0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
+    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0,
+    0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
+    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC,
+    0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
+    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A,
+    0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
+    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0,
+    0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
+    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B,
+    0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
+    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85,
+    0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
+    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5,
+    0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
+    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17,
+    0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
+    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88,
+    0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
+    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C,
+    0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
+    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9,
+    0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
+    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6,
+    0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
+    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E,
+    0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
+    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94,
+    0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
+    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68,
+    0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
+};
+
+/*
+ * Forward tables
+ */
+#define FT \
+\
+    V(A5,63,63,C6), V(84,7C,7C,F8), V(99,77,77,EE), V(8D,7B,7B,F6), \
+    V(0D,F2,F2,FF), V(BD,6B,6B,D6), V(B1,6F,6F,DE), V(54,C5,C5,91), \
+    V(50,30,30,60), V(03,01,01,02), V(A9,67,67,CE), V(7D,2B,2B,56), \
+    V(19,FE,FE,E7), V(62,D7,D7,B5), V(E6,AB,AB,4D), V(9A,76,76,EC), \
+    V(45,CA,CA,8F), V(9D,82,82,1F), V(40,C9,C9,89), V(87,7D,7D,FA), \
+    V(15,FA,FA,EF), V(EB,59,59,B2), V(C9,47,47,8E), V(0B,F0,F0,FB), \
+    V(EC,AD,AD,41), V(67,D4,D4,B3), V(FD,A2,A2,5F), V(EA,AF,AF,45), \
+    V(BF,9C,9C,23), V(F7,A4,A4,53), V(96,72,72,E4), V(5B,C0,C0,9B), \
+    V(C2,B7,B7,75), V(1C,FD,FD,E1), V(AE,93,93,3D), V(6A,26,26,4C), \
+    V(5A,36,36,6C), V(41,3F,3F,7E), V(02,F7,F7,F5), V(4F,CC,CC,83), \
+    V(5C,34,34,68), V(F4,A5,A5,51), V(34,E5,E5,D1), V(08,F1,F1,F9), \
+    V(93,71,71,E2), V(73,D8,D8,AB), V(53,31,31,62), V(3F,15,15,2A), \
+    V(0C,04,04,08), V(52,C7,C7,95), V(65,23,23,46), V(5E,C3,C3,9D), \
+    V(28,18,18,30), V(A1,96,96,37), V(0F,05,05,0A), V(B5,9A,9A,2F), \
+    V(09,07,07,0E), V(36,12,12,24), V(9B,80,80,1B), V(3D,E2,E2,DF), \
+    V(26,EB,EB,CD), V(69,27,27,4E), V(CD,B2,B2,7F), V(9F,75,75,EA), \
+    V(1B,09,09,12), V(9E,83,83,1D), V(74,2C,2C,58), V(2E,1A,1A,34), \
+    V(2D,1B,1B,36), V(B2,6E,6E,DC), V(EE,5A,5A,B4), V(FB,A0,A0,5B), \
+    V(F6,52,52,A4), V(4D,3B,3B,76), V(61,D6,D6,B7), V(CE,B3,B3,7D), \
+    V(7B,29,29,52), V(3E,E3,E3,DD), V(71,2F,2F,5E), V(97,84,84,13), \
+    V(F5,53,53,A6), V(68,D1,D1,B9), V(00,00,00,00), V(2C,ED,ED,C1), \
+    V(60,20,20,40), V(1F,FC,FC,E3), V(C8,B1,B1,79), V(ED,5B,5B,B6), \
+    V(BE,6A,6A,D4), V(46,CB,CB,8D), V(D9,BE,BE,67), V(4B,39,39,72), \
+    V(DE,4A,4A,94), V(D4,4C,4C,98), V(E8,58,58,B0), V(4A,CF,CF,85), \
+    V(6B,D0,D0,BB), V(2A,EF,EF,C5), V(E5,AA,AA,4F), V(16,FB,FB,ED), \
+    V(C5,43,43,86), V(D7,4D,4D,9A), V(55,33,33,66), V(94,85,85,11), \
+    V(CF,45,45,8A), V(10,F9,F9,E9), V(06,02,02,04), V(81,7F,7F,FE), \
+    V(F0,50,50,A0), V(44,3C,3C,78), V(BA,9F,9F,25), V(E3,A8,A8,4B), \
+    V(F3,51,51,A2), V(FE,A3,A3,5D), V(C0,40,40,80), V(8A,8F,8F,05), \
+    V(AD,92,92,3F), V(BC,9D,9D,21), V(48,38,38,70), V(04,F5,F5,F1), \
+    V(DF,BC,BC,63), V(C1,B6,B6,77), V(75,DA,DA,AF), V(63,21,21,42), \
+    V(30,10,10,20), V(1A,FF,FF,E5), V(0E,F3,F3,FD), V(6D,D2,D2,BF), \
+    V(4C,CD,CD,81), V(14,0C,0C,18), V(35,13,13,26), V(2F,EC,EC,C3), \
+    V(E1,5F,5F,BE), V(A2,97,97,35), V(CC,44,44,88), V(39,17,17,2E), \
+    V(57,C4,C4,93), V(F2,A7,A7,55), V(82,7E,7E,FC), V(47,3D,3D,7A), \
+    V(AC,64,64,C8), V(E7,5D,5D,BA), V(2B,19,19,32), V(95,73,73,E6), \
+    V(A0,60,60,C0), V(98,81,81,19), V(D1,4F,4F,9E), V(7F,DC,DC,A3), \
+    V(66,22,22,44), V(7E,2A,2A,54), V(AB,90,90,3B), V(83,88,88,0B), \
+    V(CA,46,46,8C), V(29,EE,EE,C7), V(D3,B8,B8,6B), V(3C,14,14,28), \
+    V(79,DE,DE,A7), V(E2,5E,5E,BC), V(1D,0B,0B,16), V(76,DB,DB,AD), \
+    V(3B,E0,E0,DB), V(56,32,32,64), V(4E,3A,3A,74), V(1E,0A,0A,14), \
+    V(DB,49,49,92), V(0A,06,06,0C), V(6C,24,24,48), V(E4,5C,5C,B8), \
+    V(5D,C2,C2,9F), V(6E,D3,D3,BD), V(EF,AC,AC,43), V(A6,62,62,C4), \
+    V(A8,91,91,39), V(A4,95,95,31), V(37,E4,E4,D3), V(8B,79,79,F2), \
+    V(32,E7,E7,D5), V(43,C8,C8,8B), V(59,37,37,6E), V(B7,6D,6D,DA), \
+    V(8C,8D,8D,01), V(64,D5,D5,B1), V(D2,4E,4E,9C), V(E0,A9,A9,49), \
+    V(B4,6C,6C,D8), V(FA,56,56,AC), V(07,F4,F4,F3), V(25,EA,EA,CF), \
+    V(AF,65,65,CA), V(8E,7A,7A,F4), V(E9,AE,AE,47), V(18,08,08,10), \
+    V(D5,BA,BA,6F), V(88,78,78,F0), V(6F,25,25,4A), V(72,2E,2E,5C), \
+    V(24,1C,1C,38), V(F1,A6,A6,57), V(C7,B4,B4,73), V(51,C6,C6,97), \
+    V(23,E8,E8,CB), V(7C,DD,DD,A1), V(9C,74,74,E8), V(21,1F,1F,3E), \
+    V(DD,4B,4B,96), V(DC,BD,BD,61), V(86,8B,8B,0D), V(85,8A,8A,0F), \
+    V(90,70,70,E0), V(42,3E,3E,7C), V(C4,B5,B5,71), V(AA,66,66,CC), \
+    V(D8,48,48,90), V(05,03,03,06), V(01,F6,F6,F7), V(12,0E,0E,1C), \
+    V(A3,61,61,C2), V(5F,35,35,6A), V(F9,57,57,AE), V(D0,B9,B9,69), \
+    V(91,86,86,17), V(58,C1,C1,99), V(27,1D,1D,3A), V(B9,9E,9E,27), \
+    V(38,E1,E1,D9), V(13,F8,F8,EB), V(B3,98,98,2B), V(33,11,11,22), \
+    V(BB,69,69,D2), V(70,D9,D9,A9), V(89,8E,8E,07), V(A7,94,94,33), \
+    V(B6,9B,9B,2D), V(22,1E,1E,3C), V(92,87,87,15), V(20,E9,E9,C9), \
+    V(49,CE,CE,87), V(FF,55,55,AA), V(78,28,28,50), V(7A,DF,DF,A5), \
+    V(8F,8C,8C,03), V(F8,A1,A1,59), V(80,89,89,09), V(17,0D,0D,1A), \
+    V(DA,BF,BF,65), V(31,E6,E6,D7), V(C6,42,42,84), V(B8,68,68,D0), \
+    V(C3,41,41,82), V(B0,99,99,29), V(77,2D,2D,5A), V(11,0F,0F,1E), \
+    V(CB,B0,B0,7B), V(FC,54,54,A8), V(D6,BB,BB,6D), V(3A,16,16,2C)
+
+#define V(a,b,c,d) 0x##a##b##c##d
+static const unsigned long FT0[256] = { FT };
+#undef V
+
+#define V(a,b,c,d) 0x##b##c##d##a
+static const unsigned long FT1[256] = { FT };
+#undef V
+
+#define V(a,b,c,d) 0x##c##d##a##b
+static const unsigned long FT2[256] = { FT };
+#undef V
+
+#define V(a,b,c,d) 0x##d##a##b##c
+static const unsigned long FT3[256] = { FT };
+#undef V
+
+#undef FT
+
+/*
+ * Reverse S-box
+ */
+static const unsigned char RSb[256] =
+{
+    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38,
+    0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
+    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87,
+    0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
+    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D,
+    0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
+    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2,
+    0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
+    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16,
+    0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
+    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA,
+    0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
+    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A,
+    0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
+    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02,
+    0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
+    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA,
+    0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
+    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85,
+    0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
+    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89,
+    0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
+    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20,
+    0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
+    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31,
+    0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
+    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D,
+    0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
+    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0,
+    0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
+    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26,
+    0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
+};
+
+/*
+ * Reverse tables
+ */
+#define RT \
+\
+    V(50,A7,F4,51), V(53,65,41,7E), V(C3,A4,17,1A), V(96,5E,27,3A), \
+    V(CB,6B,AB,3B), V(F1,45,9D,1F), V(AB,58,FA,AC), V(93,03,E3,4B), \
+    V(55,FA,30,20), V(F6,6D,76,AD), V(91,76,CC,88), V(25,4C,02,F5), \
+    V(FC,D7,E5,4F), V(D7,CB,2A,C5), V(80,44,35,26), V(8F,A3,62,B5), \
+    V(49,5A,B1,DE), V(67,1B,BA,25), V(98,0E,EA,45), V(E1,C0,FE,5D), \
+    V(02,75,2F,C3), V(12,F0,4C,81), V(A3,97,46,8D), V(C6,F9,D3,6B), \
+    V(E7,5F,8F,03), V(95,9C,92,15), V(EB,7A,6D,BF), V(DA,59,52,95), \
+    V(2D,83,BE,D4), V(D3,21,74,58), V(29,69,E0,49), V(44,C8,C9,8E), \
+    V(6A,89,C2,75), V(78,79,8E,F4), V(6B,3E,58,99), V(DD,71,B9,27), \
+    V(B6,4F,E1,BE), V(17,AD,88,F0), V(66,AC,20,C9), V(B4,3A,CE,7D), \
+    V(18,4A,DF,63), V(82,31,1A,E5), V(60,33,51,97), V(45,7F,53,62), \
+    V(E0,77,64,B1), V(84,AE,6B,BB), V(1C,A0,81,FE), V(94,2B,08,F9), \
+    V(58,68,48,70), V(19,FD,45,8F), V(87,6C,DE,94), V(B7,F8,7B,52), \
+    V(23,D3,73,AB), V(E2,02,4B,72), V(57,8F,1F,E3), V(2A,AB,55,66), \
+    V(07,28,EB,B2), V(03,C2,B5,2F), V(9A,7B,C5,86), V(A5,08,37,D3), \
+    V(F2,87,28,30), V(B2,A5,BF,23), V(BA,6A,03,02), V(5C,82,16,ED), \
+    V(2B,1C,CF,8A), V(92,B4,79,A7), V(F0,F2,07,F3), V(A1,E2,69,4E), \
+    V(CD,F4,DA,65), V(D5,BE,05,06), V(1F,62,34,D1), V(8A,FE,A6,C4), \
+    V(9D,53,2E,34), V(A0,55,F3,A2), V(32,E1,8A,05), V(75,EB,F6,A4), \
+    V(39,EC,83,0B), V(AA,EF,60,40), V(06,9F,71,5E), V(51,10,6E,BD), \
+    V(F9,8A,21,3E), V(3D,06,DD,96), V(AE,05,3E,DD), V(46,BD,E6,4D), \
+    V(B5,8D,54,91), V(05,5D,C4,71), V(6F,D4,06,04), V(FF,15,50,60), \
+    V(24,FB,98,19), V(97,E9,BD,D6), V(CC,43,40,89), V(77,9E,D9,67), \
+    V(BD,42,E8,B0), V(88,8B,89,07), V(38,5B,19,E7), V(DB,EE,C8,79), \
+    V(47,0A,7C,A1), V(E9,0F,42,7C), V(C9,1E,84,F8), V(00,00,00,00), \
+    V(83,86,80,09), V(48,ED,2B,32), V(AC,70,11,1E), V(4E,72,5A,6C), \
+    V(FB,FF,0E,FD), V(56,38,85,0F), V(1E,D5,AE,3D), V(27,39,2D,36), \
+    V(64,D9,0F,0A), V(21,A6,5C,68), V(D1,54,5B,9B), V(3A,2E,36,24), \
+    V(B1,67,0A,0C), V(0F,E7,57,93), V(D2,96,EE,B4), V(9E,91,9B,1B), \
+    V(4F,C5,C0,80), V(A2,20,DC,61), V(69,4B,77,5A), V(16,1A,12,1C), \
+    V(0A,BA,93,E2), V(E5,2A,A0,C0), V(43,E0,22,3C), V(1D,17,1B,12), \
+    V(0B,0D,09,0E), V(AD,C7,8B,F2), V(B9,A8,B6,2D), V(C8,A9,1E,14), \
+    V(85,19,F1,57), V(4C,07,75,AF), V(BB,DD,99,EE), V(FD,60,7F,A3), \
+    V(9F,26,01,F7), V(BC,F5,72,5C), V(C5,3B,66,44), V(34,7E,FB,5B), \
+    V(76,29,43,8B), V(DC,C6,23,CB), V(68,FC,ED,B6), V(63,F1,E4,B8), \
+    V(CA,DC,31,D7), V(10,85,63,42), V(40,22,97,13), V(20,11,C6,84), \
+    V(7D,24,4A,85), V(F8,3D,BB,D2), V(11,32,F9,AE), V(6D,A1,29,C7), \
+    V(4B,2F,9E,1D), V(F3,30,B2,DC), V(EC,52,86,0D), V(D0,E3,C1,77), \
+    V(6C,16,B3,2B), V(99,B9,70,A9), V(FA,48,94,11), V(22,64,E9,47), \
+    V(C4,8C,FC,A8), V(1A,3F,F0,A0), V(D8,2C,7D,56), V(EF,90,33,22), \
+    V(C7,4E,49,87), V(C1,D1,38,D9), V(FE,A2,CA,8C), V(36,0B,D4,98), \
+    V(CF,81,F5,A6), V(28,DE,7A,A5), V(26,8E,B7,DA), V(A4,BF,AD,3F), \
+    V(E4,9D,3A,2C), V(0D,92,78,50), V(9B,CC,5F,6A), V(62,46,7E,54), \
+    V(C2,13,8D,F6), V(E8,B8,D8,90), V(5E,F7,39,2E), V(F5,AF,C3,82), \
+    V(BE,80,5D,9F), V(7C,93,D0,69), V(A9,2D,D5,6F), V(B3,12,25,CF), \
+    V(3B,99,AC,C8), V(A7,7D,18,10), V(6E,63,9C,E8), V(7B,BB,3B,DB), \
+    V(09,78,26,CD), V(F4,18,59,6E), V(01,B7,9A,EC), V(A8,9A,4F,83), \
+    V(65,6E,95,E6), V(7E,E6,FF,AA), V(08,CF,BC,21), V(E6,E8,15,EF), \
+    V(D9,9B,E7,BA), V(CE,36,6F,4A), V(D4,09,9F,EA), V(D6,7C,B0,29), \
+    V(AF,B2,A4,31), V(31,23,3F,2A), V(30,94,A5,C6), V(C0,66,A2,35), \
+    V(37,BC,4E,74), V(A6,CA,82,FC), V(B0,D0,90,E0), V(15,D8,A7,33), \
+    V(4A,98,04,F1), V(F7,DA,EC,41), V(0E,50,CD,7F), V(2F,F6,91,17), \
+    V(8D,D6,4D,76), V(4D,B0,EF,43), V(54,4D,AA,CC), V(DF,04,96,E4), \
+    V(E3,B5,D1,9E), V(1B,88,6A,4C), V(B8,1F,2C,C1), V(7F,51,65,46), \
+    V(04,EA,5E,9D), V(5D,35,8C,01), V(73,74,87,FA), V(2E,41,0B,FB), \
+    V(5A,1D,67,B3), V(52,D2,DB,92), V(33,56,10,E9), V(13,47,D6,6D), \
+    V(8C,61,D7,9A), V(7A,0C,A1,37), V(8E,14,F8,59), V(89,3C,13,EB), \
+    V(EE,27,A9,CE), V(35,C9,61,B7), V(ED,E5,1C,E1), V(3C,B1,47,7A), \
+    V(59,DF,D2,9C), V(3F,73,F2,55), V(79,CE,14,18), V(BF,37,C7,73), \
+    V(EA,CD,F7,53), V(5B,AA,FD,5F), V(14,6F,3D,DF), V(86,DB,44,78), \
+    V(81,F3,AF,CA), V(3E,C4,68,B9), V(2C,34,24,38), V(5F,40,A3,C2), \
+    V(72,C3,1D,16), V(0C,25,E2,BC), V(8B,49,3C,28), V(41,95,0D,FF), \
+    V(71,01,A8,39), V(DE,B3,0C,08), V(9C,E4,B4,D8), V(90,C1,56,64), \
+    V(61,84,CB,7B), V(70,B6,32,D5), V(74,5C,6C,48), V(42,57,B8,D0)
+
+#define V(a,b,c,d) 0x##a##b##c##d
+static const unsigned long RT0[256] = { RT };
+#undef V
+
+#define V(a,b,c,d) 0x##b##c##d##a
+static const unsigned long RT1[256] = { RT };
+#undef V
+
+#define V(a,b,c,d) 0x##c##d##a##b
+static const unsigned long RT2[256] = { RT };
+#undef V
+
+#define V(a,b,c,d) 0x##d##a##b##c
+static const unsigned long RT3[256] = { RT };
+#undef V
+
+#undef RT
+
+/*
+ * Round constants
+ */
+static const unsigned long RCON[10] =
+{
+    0x00000001, 0x00000002, 0x00000004, 0x00000008,
+    0x00000010, 0x00000020, 0x00000040, 0x00000080,
+    0x0000001B, 0x00000036
+};
+
+#else
+
+/*
+ * Forward S-box & tables
+ */
+static unsigned char FSb[256];
+static unsigned long FT0[256];
+static unsigned long FT1[256];
+static unsigned long FT2[256];
+static unsigned long FT3[256];
+
+/*
+ * Reverse S-box & tables
+ */
+static unsigned char RSb[256];
+static unsigned long RT0[256];
+static unsigned long RT1[256];
+static unsigned long RT2[256];
+static unsigned long RT3[256];
+
+/*
+ * Round constants
+ */
+static unsigned long RCON[10];
+
+/*
+ * Tables generation code
+ */
+#define ROTL8(x) ( ( x << 8 ) & 0xFFFFFFFF ) | ( x >> 24 )
+#define XTIME(x) ( ( x << 1 ) ^ ( ( x & 0x80 ) ? 0x1B : 0x00 ) )
+#define MUL(x,y) ( ( x && y ) ? pow[(log[x]+log[y]) % 255] : 0 )
+
+static int aes_init_done = 0;
+
+static void aes_gen_tables( void )
+{
+    int i, x, y, z;
+    int pow[256];
+    int log[256];
+
+    /*
+     * compute pow and log tables over GF(2^8)
+     */
+    for( i = 0, x = 1; i < 256; i++ )
+    {
+        pow[i] = x;
+        log[x] = i;
+        x = ( x ^ XTIME( x ) ) & 0xFF;
+    }
+
+    /*
+     * calculate the round constants
+     */
+    for( i = 0, x = 1; i < 10; i++ )
+    {
+        RCON[i] = (unsigned long) x;
+        x = XTIME( x ) & 0xFF;
+    }
+
+    /*
+     * generate the forward and reverse S-boxes
+     */
+    FSb[0x00] = 0x63;
+    RSb[0x63] = 0x00;
+
+    for( i = 1; i < 256; i++ )
+    {
+        x = pow[255 - log[i]];
+
+        y  = x; y = ( (y << 1) | (y >> 7) ) & 0xFF;
+        x ^= y; y = ( (y << 1) | (y >> 7) ) & 0xFF;
+        x ^= y; y = ( (y << 1) | (y >> 7) ) & 0xFF;
+        x ^= y; y = ( (y << 1) | (y >> 7) ) & 0xFF;
+        x ^= y ^ 0x63;
+
+        FSb[i] = (unsigned char) x;
+        RSb[x] = (unsigned char) i;
+    }
+
+    /*
+     * generate the forward and reverse tables
+     */
+    for( i = 0; i < 256; i++ )
+    {
+        x = FSb[i];
+        y = XTIME( x ) & 0xFF;
+        z =  ( y ^ x ) & 0xFF;
+
+        FT0[i] = ( (unsigned long) y       ) ^
+                 ( (unsigned long) x <<  8 ) ^
+                 ( (unsigned long) x << 16 ) ^
+                 ( (unsigned long) z << 24 );
+
+        FT1[i] = ROTL8( FT0[i] );
+        FT2[i] = ROTL8( FT1[i] );
+        FT3[i] = ROTL8( FT2[i] );
+
+        x = RSb[i];
+
+        RT0[i] = ( (unsigned long) MUL( 0x0E, x )       ) ^
+                 ( (unsigned long) MUL( 0x09, x ) <<  8 ) ^
+                 ( (unsigned long) MUL( 0x0D, x ) << 16 ) ^
+                 ( (unsigned long) MUL( 0x0B, x ) << 24 );
+
+        RT1[i] = ROTL8( RT0[i] );
+        RT2[i] = ROTL8( RT1[i] );
+        RT3[i] = ROTL8( RT2[i] );
+    }
+}
+
+#endif
+
+/*
+ * AES key schedule (encryption)
+ */
+void aes_setkey_enc( aes_context *ctx, const unsigned char *key, int keysize )
+{
+    int i;
+    unsigned long *RK;
+
+#if !defined(XYSSL_AES_ROM_TABLES)
+    if( aes_init_done == 0 )
+    {
+        aes_gen_tables();
+        aes_init_done = 1;
+    }
+#endif
+
+    switch( keysize )
+    {
+        case 128: ctx->nr = 10; break;
+        case 192: ctx->nr = 12; break;
+        case 256: ctx->nr = 14; break;
+        default : return;
+    }
+
+#if defined(PADLOCK_ALIGN16)
+    ctx->rk = RK = PADLOCK_ALIGN16( ctx->buf );
+#else
+    ctx->rk = RK = ctx->buf;
+#endif
+
+    for( i = 0; i < (keysize >> 5); i++ )
+    {
+        GET_ULONG_LE( RK[i], key, i << 2 );
+    }
+
+    switch( ctx->nr )
+    {
+        case 10:
+
+            for( i = 0; i < 10; i++, RK += 4 )
+            {
+                RK[4]  = RK[0] ^ RCON[i] ^
+                    ( FSb[ ( RK[3] >>  8 ) & 0xFF ]       ) ^
+                    ( FSb[ ( RK[3] >> 16 ) & 0xFF ] <<  8 ) ^
+                    ( FSb[ ( RK[3] >> 24 ) & 0xFF ] << 16 ) ^
+                    ( FSb[ ( RK[3]       ) & 0xFF ] << 24 );
+
+                RK[5]  = RK[1] ^ RK[4];
+                RK[6]  = RK[2] ^ RK[5];
+                RK[7]  = RK[3] ^ RK[6];
+            }
+            break;
+
+        case 12:
+
+            for( i = 0; i < 8; i++, RK += 6 )
+            {
+                RK[6]  = RK[0] ^ RCON[i] ^
+                    ( FSb[ ( RK[5] >>  8 ) & 0xFF ]       ) ^
+                    ( FSb[ ( RK[5] >> 16 ) & 0xFF ] <<  8 ) ^
+                    ( FSb[ ( RK[5] >> 24 ) & 0xFF ] << 16 ) ^
+                    ( FSb[ ( RK[5]       ) & 0xFF ] << 24 );
+
+                RK[7]  = RK[1] ^ RK[6];
+                RK[8]  = RK[2] ^ RK[7];
+                RK[9]  = RK[3] ^ RK[8];
+                RK[10] = RK[4] ^ RK[9];
+                RK[11] = RK[5] ^ RK[10];
+            }
+            break;
+
+        case 14:
+
+            for( i = 0; i < 7; i++, RK += 8 )
+            {
+                RK[8]  = RK[0] ^ RCON[i] ^
+                    ( FSb[ ( RK[7] >>  8 ) & 0xFF ]       ) ^
+                    ( FSb[ ( RK[7] >> 16 ) & 0xFF ] <<  8 ) ^
+                    ( FSb[ ( RK[7] >> 24 ) & 0xFF ] << 16 ) ^
+                    ( FSb[ ( RK[7]       ) & 0xFF ] << 24 );
+
+                RK[9]  = RK[1] ^ RK[8];
+                RK[10] = RK[2] ^ RK[9];
+                RK[11] = RK[3] ^ RK[10];
+
+                RK[12] = RK[4] ^
+                    ( FSb[ ( RK[11]       ) & 0xFF ]       ) ^
+                    ( FSb[ ( RK[11] >>  8 ) & 0xFF ] <<  8 ) ^
+                    ( FSb[ ( RK[11] >> 16 ) & 0xFF ] << 16 ) ^
+                    ( FSb[ ( RK[11] >> 24 ) & 0xFF ] << 24 );
+
+                RK[13] = RK[5] ^ RK[12];
+                RK[14] = RK[6] ^ RK[13];
+                RK[15] = RK[7] ^ RK[14];
+            }
+            break;
+
+        default:
+
+            break;
+    }
+}
+
+/*
+ * AES key schedule (decryption)
+ */
+void aes_setkey_dec( aes_context *ctx, const unsigned char *key, int keysize )
+{
+    int i, j;
+    aes_context cty;
+    unsigned long *RK;
+    unsigned long *SK;
+
+    switch( keysize )
+    {
+        case 128: ctx->nr = 10; break;
+        case 192: ctx->nr = 12; break;
+        case 256: ctx->nr = 14; break;
+        default : return;
+    }
+
+#if defined(PADLOCK_ALIGN16)
+    ctx->rk = RK = PADLOCK_ALIGN16( ctx->buf );
+#else
+    ctx->rk = RK = ctx->buf;
+#endif
+
+    aes_setkey_enc( &cty, key, keysize );
+    SK = cty.rk + cty.nr * 4;
+
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+
+    for( i = ctx->nr - 1, SK -= 8; i > 0; i--, SK -= 8 )
+    {
+        for( j = 0; j < 4; j++, SK++ )
+        {
+            *RK++ = RT0[ FSb[ ( *SK       ) & 0xFF ] ] ^
+                    RT1[ FSb[ ( *SK >>  8 ) & 0xFF ] ] ^
+                    RT2[ FSb[ ( *SK >> 16 ) & 0xFF ] ] ^
+                    RT3[ FSb[ ( *SK >> 24 ) & 0xFF ] ];
+        }
+    }
+
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+    *RK++ = *SK++;
+
+    memset( &cty, 0, sizeof( aes_context ) );
+}
+
+#define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)     \
+{                                               \
+    X0 = *RK++ ^ FT0[ ( Y0       ) & 0xFF ] ^   \
+                 FT1[ ( Y1 >>  8 ) & 0xFF ] ^   \
+                 FT2[ ( Y2 >> 16 ) & 0xFF ] ^   \
+                 FT3[ ( Y3 >> 24 ) & 0xFF ];    \
+                                                \
+    X1 = *RK++ ^ FT0[ ( Y1       ) & 0xFF ] ^   \
+                 FT1[ ( Y2 >>  8 ) & 0xFF ] ^   \
+                 FT2[ ( Y3 >> 16 ) & 0xFF ] ^   \
+                 FT3[ ( Y0 >> 24 ) & 0xFF ];    \
+                                                \
+    X2 = *RK++ ^ FT0[ ( Y2       ) & 0xFF ] ^   \
+                 FT1[ ( Y3 >>  8 ) & 0xFF ] ^   \
+                 FT2[ ( Y0 >> 16 ) & 0xFF ] ^   \
+                 FT3[ ( Y1 >> 24 ) & 0xFF ];    \
+                                                \
+    X3 = *RK++ ^ FT0[ ( Y3       ) & 0xFF ] ^   \
+                 FT1[ ( Y0 >>  8 ) & 0xFF ] ^   \
+                 FT2[ ( Y1 >> 16 ) & 0xFF ] ^   \
+                 FT3[ ( Y2 >> 24 ) & 0xFF ];    \
+}
+
+#define AES_RROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3)     \
+{                                               \
+    X0 = *RK++ ^ RT0[ ( Y0       ) & 0xFF ] ^   \
+                 RT1[ ( Y3 >>  8 ) & 0xFF ] ^   \
+                 RT2[ ( Y2 >> 16 ) & 0xFF ] ^   \
+                 RT3[ ( Y1 >> 24 ) & 0xFF ];    \
+                                                \
+    X1 = *RK++ ^ RT0[ ( Y1       ) & 0xFF ] ^   \
+                 RT1[ ( Y0 >>  8 ) & 0xFF ] ^   \
+                 RT2[ ( Y3 >> 16 ) & 0xFF ] ^   \
+                 RT3[ ( Y2 >> 24 ) & 0xFF ];    \
+                                                \
+    X2 = *RK++ ^ RT0[ ( Y2       ) & 0xFF ] ^   \
+                 RT1[ ( Y1 >>  8 ) & 0xFF ] ^   \
+                 RT2[ ( Y0 >> 16 ) & 0xFF ] ^   \
+                 RT3[ ( Y3 >> 24 ) & 0xFF ];    \
+                                                \
+    X3 = *RK++ ^ RT0[ ( Y3       ) & 0xFF ] ^   \
+                 RT1[ ( Y2 >>  8 ) & 0xFF ] ^   \
+                 RT2[ ( Y1 >> 16 ) & 0xFF ] ^   \
+                 RT3[ ( Y0 >> 24 ) & 0xFF ];    \
+}
+
+/*
+ * AES-ECB block encryption/decryption
+ */
+void aes_crypt_ecb( aes_context *ctx,
+                    int mode,
+                    const unsigned char input[16],
+                    unsigned char output[16] )
+{
+    int i;
+    unsigned long *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3;
+
+#if defined(XYSSL_PADLOCK_C) && defined(XYSSL_HAVE_X86)
+    if( padlock_supports( PADLOCK_ACE ) )
+    {
+        if( padlock_xcryptecb( ctx, mode, input, output ) == 0 )
+            return;
+    }
+#endif
+
+    RK = ctx->rk;
+
+    GET_ULONG_LE( X0, input,  0 ); X0 ^= *RK++;
+    GET_ULONG_LE( X1, input,  4 ); X1 ^= *RK++;
+    GET_ULONG_LE( X2, input,  8 ); X2 ^= *RK++;
+    GET_ULONG_LE( X3, input, 12 ); X3 ^= *RK++;
+
+    if( mode == AES_DECRYPT )
+    {
+        for( i = (ctx->nr >> 1) - 1; i > 0; i-- )
+        {
+            AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+            AES_RROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
+        }
+
+        AES_RROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+
+        X0 = *RK++ ^ ( RSb[ ( Y0       ) & 0xFF ]       ) ^
+                     ( RSb[ ( Y3 >>  8 ) & 0xFF ] <<  8 ) ^
+                     ( RSb[ ( Y2 >> 16 ) & 0xFF ] << 16 ) ^
+                     ( RSb[ ( Y1 >> 24 ) & 0xFF ] << 24 );
+
+        X1 = *RK++ ^ ( RSb[ ( Y1       ) & 0xFF ]       ) ^
+                     ( RSb[ ( Y0 >>  8 ) & 0xFF ] <<  8 ) ^
+                     ( RSb[ ( Y3 >> 16 ) & 0xFF ] << 16 ) ^
+                     ( RSb[ ( Y2 >> 24 ) & 0xFF ] << 24 );
+
+        X2 = *RK++ ^ ( RSb[ ( Y2       ) & 0xFF ]       ) ^
+                     ( RSb[ ( Y1 >>  8 ) & 0xFF ] <<  8 ) ^
+                     ( RSb[ ( Y0 >> 16 ) & 0xFF ] << 16 ) ^
+                     ( RSb[ ( Y3 >> 24 ) & 0xFF ] << 24 );
+
+        X3 = *RK++ ^ ( RSb[ ( Y3       ) & 0xFF ]       ) ^
+                     ( RSb[ ( Y2 >>  8 ) & 0xFF ] <<  8 ) ^
+                     ( RSb[ ( Y1 >> 16 ) & 0xFF ] << 16 ) ^
+                     ( RSb[ ( Y0 >> 24 ) & 0xFF ] << 24 );
+    }
+    else /* AES_ENCRYPT */
+    {
+        for( i = (ctx->nr >> 1) - 1; i > 0; i-- )
+        {
+            AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+            AES_FROUND( X0, X1, X2, X3, Y0, Y1, Y2, Y3 );
+        }
+
+        AES_FROUND( Y0, Y1, Y2, Y3, X0, X1, X2, X3 );
+
+        X0 = *RK++ ^ ( FSb[ ( Y0       ) & 0xFF ]       ) ^
+                     ( FSb[ ( Y1 >>  8 ) & 0xFF ] <<  8 ) ^
+                     ( FSb[ ( Y2 >> 16 ) & 0xFF ] << 16 ) ^
+                     ( FSb[ ( Y3 >> 24 ) & 0xFF ] << 24 );
+
+        X1 = *RK++ ^ ( FSb[ ( Y1       ) & 0xFF ]       ) ^
+                     ( FSb[ ( Y2 >>  8 ) & 0xFF ] <<  8 ) ^
+                     ( FSb[ ( Y3 >> 16 ) & 0xFF ] << 16 ) ^
+                     ( FSb[ ( Y0 >> 24 ) & 0xFF ] << 24 );
+
+        X2 = *RK++ ^ ( FSb[ ( Y2       ) & 0xFF ]       ) ^
+                     ( FSb[ ( Y3 >>  8 ) & 0xFF ] <<  8 ) ^
+                     ( FSb[ ( Y0 >> 16 ) & 0xFF ] << 16 ) ^
+                     ( FSb[ ( Y1 >> 24 ) & 0xFF ] << 24 );
+
+        X3 = *RK++ ^ ( FSb[ ( Y3       ) & 0xFF ]       ) ^
+                     ( FSb[ ( Y0 >>  8 ) & 0xFF ] <<  8 ) ^
+                     ( FSb[ ( Y1 >> 16 ) & 0xFF ] << 16 ) ^
+                     ( FSb[ ( Y2 >> 24 ) & 0xFF ] << 24 );
+    }
+
+    PUT_ULONG_LE( X0, output,  0 );
+    PUT_ULONG_LE( X1, output,  4 );
+    PUT_ULONG_LE( X2, output,  8 );
+    PUT_ULONG_LE( X3, output, 12 );
+}
+
+/*
+ * AES-CBC buffer encryption/decryption
+ */
+void aes_crypt_cbc( aes_context *ctx,
+                    int mode,
+                    int length,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output )
+{
+    int i;
+    unsigned char temp[16];
+
+#if defined(XYSSL_PADLOCK_C) && defined(XYSSL_HAVE_X86)
+    if( padlock_supports( PADLOCK_ACE ) )
+    {
+        if( padlock_xcryptcbc( ctx, mode, length, iv, input, output ) == 0 )
+            return;
+    }
+#endif
+
+    if( mode == AES_DECRYPT )
+    {
+        while( length > 0 )
+        {
+            memcpy( temp, input, 16 );
+            aes_crypt_ecb( ctx, mode, input, output );
+
+            for( i = 0; i < 16; i++ )
+                output[i] = (unsigned char)( output[i] ^ iv[i] );
+
+            memcpy( iv, temp, 16 );
+
+            input  += 16;
+            output += 16;
+            length -= 16;
+        }
+    }
+    else
+    {
+        while( length > 0 )
+        {
+            for( i = 0; i < 16; i++ )
+                output[i] = (unsigned char)( input[i] ^ iv[i] );
+
+            aes_crypt_ecb( ctx, mode, output, output );
+            memcpy( iv, output, 16 );
+
+            input  += 16;
+            output += 16;
+            length -= 16;
+        }
+    }
+}
+
+/*
+ * AES-CFB buffer encryption/decryption
+ */
+void aes_crypt_cfb( aes_context *ctx,
+                    int mode,
+                    int length,
+                    int *iv_off,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output )
+{
+    int c, n = *iv_off;
+
+    if( mode == AES_DECRYPT )
+    {
+        while( length-- )
+        {
+            if( n == 0 )
+                aes_crypt_ecb( ctx, AES_ENCRYPT, iv, iv );
+
+            c = *input++;
+            *output++ = (unsigned char)( c ^ iv[n] );
+            iv[n] = (unsigned char) c;
+
+            n = (n + 1) & 0x0F;
+        }
+    }
+    else
+    {
+        while( length-- )
+        {
+            if( n == 0 )
+                aes_crypt_ecb( ctx, AES_ENCRYPT, iv, iv );
+
+            iv[n] = *output++ = (unsigned char)( iv[n] ^ *input++ );
+
+            n = (n + 1) & 0x0F;
+        }
+    }
+
+    *iv_off = n;
+}
+
+#if defined(XYSSL_SELF_TEST)
+
+#include <stdio.h>
+
+/*
+ * AES test vectors from:
+ *
+ * http://csrc.nist.gov/archive/aes/rijndael/rijndael-vals.zip
+ */
+static const unsigned char aes_test_ecb_dec[3][16] =
+{
+    { 0x44, 0x41, 0x6A, 0xC2, 0xD1, 0xF5, 0x3C, 0x58,
+      0x33, 0x03, 0x91, 0x7E, 0x6B, 0xE9, 0xEB, 0xE0 },
+    { 0x48, 0xE3, 0x1E, 0x9E, 0x25, 0x67, 0x18, 0xF2,
+      0x92, 0x29, 0x31, 0x9C, 0x19, 0xF1, 0x5B, 0xA4 },
+    { 0x05, 0x8C, 0xCF, 0xFD, 0xBB, 0xCB, 0x38, 0x2D,
+      0x1F, 0x6F, 0x56, 0x58, 0x5D, 0x8A, 0x4A, 0xDE }
+};
+
+static const unsigned char aes_test_ecb_enc[3][16] =
+{
+    { 0xC3, 0x4C, 0x05, 0x2C, 0xC0, 0xDA, 0x8D, 0x73,
+      0x45, 0x1A, 0xFE, 0x5F, 0x03, 0xBE, 0x29, 0x7F },
+    { 0xF3, 0xF6, 0x75, 0x2A, 0xE8, 0xD7, 0x83, 0x11,
+      0x38, 0xF0, 0x41, 0x56, 0x06, 0x31, 0xB1, 0x14 },
+    { 0x8B, 0x79, 0xEE, 0xCC, 0x93, 0xA0, 0xEE, 0x5D,
+      0xFF, 0x30, 0xB4, 0xEA, 0x21, 0x63, 0x6D, 0xA4 }
+};
+
+static const unsigned char aes_test_cbc_dec[3][16] =
+{
+    { 0xFA, 0xCA, 0x37, 0xE0, 0xB0, 0xC8, 0x53, 0x73,
+      0xDF, 0x70, 0x6E, 0x73, 0xF7, 0xC9, 0xAF, 0x86 },
+    { 0x5D, 0xF6, 0x78, 0xDD, 0x17, 0xBA, 0x4E, 0x75,
+      0xB6, 0x17, 0x68, 0xC6, 0xAD, 0xEF, 0x7C, 0x7B },
+    { 0x48, 0x04, 0xE1, 0x81, 0x8F, 0xE6, 0x29, 0x75,
+      0x19, 0xA3, 0xE8, 0x8C, 0x57, 0x31, 0x04, 0x13 }
+};
+
+static const unsigned char aes_test_cbc_enc[3][16] =
+{
+    { 0x8A, 0x05, 0xFC, 0x5E, 0x09, 0x5A, 0xF4, 0x84,
+      0x8A, 0x08, 0xD3, 0x28, 0xD3, 0x68, 0x8E, 0x3D },
+    { 0x7B, 0xD9, 0x66, 0xD5, 0x3A, 0xD8, 0xC1, 0xBB,
+      0x85, 0xD2, 0xAD, 0xFA, 0xE8, 0x7B, 0xB1, 0x04 },
+    { 0xFE, 0x3C, 0x53, 0x65, 0x3E, 0x2F, 0x45, 0xB5,
+      0x6F, 0xCD, 0x88, 0xB2, 0xCC, 0x89, 0x8F, 0xF0 }
+};
+
+/*
+ * AES-CFB test vectors (generated on 2008-02-12)
+ */
+static const unsigned char aes_test_cfb_dec[3][16] =
+{
+    { 0xBA, 0x75, 0x0C, 0xC9, 0x77, 0xF8, 0xD4, 0xE1,
+      0x3E, 0x0F, 0xB5, 0x46, 0x2E, 0xA6, 0x33, 0xF6 },
+    { 0xDB, 0x40, 0x4A, 0x98, 0x7B, 0xAA, 0xA3, 0xF3,
+      0x92, 0x35, 0xAD, 0x58, 0x09, 0x9B, 0xFF, 0x6E },
+    { 0xA8, 0x17, 0x41, 0x0E, 0x76, 0x71, 0x60, 0xE5,
+      0xFD, 0x37, 0xC5, 0x43, 0xCC, 0xC8, 0xD6, 0xDA }
+};
+
+static const unsigned char aes_test_cfb_enc[3][16] =
+{
+    { 0x45, 0x62, 0xC5, 0xA1, 0xF9, 0x10, 0x8F, 0xE0,
+      0x87, 0x24, 0x25, 0x68, 0xB5, 0x12, 0xF3, 0x8B },
+    { 0xB8, 0xD4, 0xD5, 0x09, 0xF5, 0xEE, 0x08, 0x38,
+      0x48, 0x9B, 0x9D, 0xAD, 0x11, 0xB4, 0x2E, 0xD2 },
+    { 0xE9, 0x10, 0x80, 0xDA, 0xEE, 0x2D, 0x81, 0xD9,
+      0x41, 0x78, 0x91, 0xD5, 0x98, 0x78, 0xE1, 0xFA }
+};
+
+/*
+ * Checkup routine
+ */
+int aes_self_test( int verbose )
+{
+    int i, j, u, v, offset;
+    unsigned char key[32];
+    unsigned char buf[16];
+    unsigned char prv[16];
+    unsigned char iv[16];
+    aes_context ctx;
+
+    memset( key, 0, 32 );
+
+    /*
+     * ECB mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        v = i  & 1;
+
+        if( verbose != 0 )
+            printf( "  AES-ECB-%3d (%s): ", 128 + u * 64,
+                    ( v == AES_DECRYPT ) ? "dec" : "enc" );
+
+        memset( buf, 0, 16 );
+
+        if( v == AES_DECRYPT )
+        {
+            aes_setkey_dec( &ctx, key, 128 + u * 64 );
+
+            for( j = 0; j < 10000; j++ )
+                aes_crypt_ecb( &ctx, v, buf, buf );
+
+            if( memcmp( buf, aes_test_ecb_dec[u], 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+        else
+        {
+            aes_setkey_enc( &ctx, key, 128 + u * 64 );
+
+            for( j = 0; j < 10000; j++ )
+                aes_crypt_ecb( &ctx, v, buf, buf );
+
+            if( memcmp( buf, aes_test_ecb_enc[u], 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+
+        if( verbose != 0 )
+            printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    /*
+     * CBC mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        v = i  & 1;
+
+        if( verbose != 0 )
+            printf( "  AES-CBC-%3d (%s): ", 128 + u * 64,
+                    ( v == AES_DECRYPT ) ? "dec" : "enc" );
+
+        memset( iv , 0, 16 );
+        memset( prv, 0, 16 );
+        memset( buf, 0, 16 );
+
+        if( v == AES_DECRYPT )
+        {
+            aes_setkey_dec( &ctx, key, 128 + u * 64 );
+
+            for( j = 0; j < 10000; j++ )
+                aes_crypt_cbc( &ctx, v, 16, iv, buf, buf );
+
+            if( memcmp( buf, aes_test_cbc_dec[u], 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+        else
+        {
+            aes_setkey_enc( &ctx, key, 128 + u * 64 );
+
+            for( j = 0; j < 10000; j++ )
+            {
+                unsigned char tmp[16];
+
+                aes_crypt_cbc( &ctx, v, 16, iv, buf, buf );
+
+                memcpy( tmp, prv, 16 );
+                memcpy( prv, buf, 16 );
+                memcpy( buf, tmp, 16 );
+            }
+
+            if( memcmp( prv, aes_test_cbc_enc[u], 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+
+        if( verbose != 0 )
+            printf( "passed\n" );
+    }
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    /*
+     * CFB mode
+     */
+    for( i = 0; i < 6; i++ )
+    {
+        u = i >> 1;
+        v = i  & 1;
+
+        if( verbose != 0 )
+            printf( "  AES-CFB-%3d (%s): ", 128 + u * 64,
+                    ( v == AES_DECRYPT ) ? "dec" : "enc" );
+
+        memset( iv , 0, 16 );
+        memset( buf, 0, 16 );
+        offset = 0;
+
+        if( v == AES_DECRYPT )
+        {
+            aes_setkey_dec( &ctx, key, 128 + u * 64 );
+
+            for( j = 0; j < 10000; j++ )
+                aes_crypt_cfb( &ctx, v, 16, &offset, iv, buf, buf );
+
+            if( memcmp( buf, aes_test_cfb_dec[u], 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+        else
+        {
+            aes_setkey_enc( &ctx, key, 128 + u * 64 );
+
+            for( j = 0; j < 10000; j++ )
+                aes_crypt_cfb( &ctx, v, 16, &offset, iv, buf, buf );
+
+            if( memcmp( buf, aes_test_cfb_enc[u], 16 ) != 0 )
+            {
+                if( verbose != 0 )
+                    printf( "failed\n" );
+
+                return( 1 );
+            }
+        }
+
+        if( verbose != 0 )
+            printf( "passed\n" );
+    }
+
+
+    if( verbose != 0 )
+        printf( "\n" );
+
+    return( 0 );
+}
+
+int main(int argc, char *argv[])
+{
+    return aes_self_test(1);
+}
+
+#endif /* defined(XYSSL_SELF_TEST) */
diff --git a/fitz/filt_aesd.c b/fitz/filt_aesd.c
new file mode 100644
index 00000000..63145bf1
--- /dev/null
+++ b/fitz/filt_aesd.c
@@ -0,0 +1,73 @@
+#include "fitz_base.h"
+#include "fitz_stream.h"
+
+typedef struct fz_aesd_s fz_aesd;
+
+struct fz_aesd_s
+{
+    fz_filter super;
+    fz_aes aes;
+    unsigned char iv[16];
+    int ivcount;
+};
+
+fz_error
+fz_newaesdfilter(fz_filter **fp, unsigned char *key, unsigned keylen)
+{
+    FZ_NEWFILTER(fz_aesd, f, aesdfilter);
+    aes_setkey_dec(&f->aes, key, keylen * 8);
+    f->ivcount = 0;
+    return fz_okay;
+}
+
+void
+fz_dropaesdfilter(fz_filter *f)
+{
+}
+
+fz_error
+fz_processaesdfilter(fz_filter *filter, fz_buffer *in, fz_buffer *out)
+{
+    fz_aesd *f = (fz_aesd*)filter;
+    int n;
+
+    while (1)
+    {
+	if (in->rp + 16 > in->wp)
+	{
+	    if (in->eof)
+		return fz_iodone;
+	    return fz_ioneedin;
+	}
+
+	if (f->ivcount < 16)
+	{
+	    f->iv[f->ivcount++] = *in->rp++;
+	}
+	else
+	{
+	    if (out->wp + 16 > out->ep)
+		return fz_ioneedout;
+
+	    n = MIN(in->wp - in->rp, out->ep - out->wp);
+	    if (n % 16 != 0)
+		return fz_throw("size of data to decrypt not a multiple of 16");
+	    if (n < 16)
+		return fz_throw("size of data to decrypt too small");
+
+	    aes_crypt_cbc(&f->aes, AES_DECRYPT, n, f->iv, in->rp, out->wp);
+	    in->rp += n;
+	    out->wp += n;
+
+	    /* Remove padding bytes */
+	    if (in->eof && in->rp == in->wp)
+	    {
+		int pad = out->wp[-1];
+		if (pad < 1 || pad > 16)
+		    return fz_throw("aes padding out of range: %d", pad);
+		out->wp -= pad;
+	    }
+	}
+    }
+}
+
diff --git a/fitz/filt_copy.c b/fitz/filt_copy.c
new file mode 100644
index 00000000..f6a00ec0
--- /dev/null
+++ b/fitz/filt_copy.c
@@ -0,0 +1,50 @@
+#include "fitz_base.h"
+#include "fitz_stream.h"
+
+typedef struct fz_copyfilter_s fz_copyfilter;
+
+struct fz_copyfilter_s
+{
+	fz_filter super;
+};
+
+fz_error
+fz_newcopyfilter(fz_filter **fp)
+{
+    FZ_NEWFILTER(fz_copyfilter, f, copyfilter);
+    return fz_okay;
+}
+
+void
+fz_dropcopyfilter(fz_filter *f)
+{
+}
+
+fz_error
+fz_processcopyfilter(fz_filter *filter, fz_buffer *in, fz_buffer *out)
+{
+    fz_copyfilter *f = (fz_copyfilter*)filter;
+    int n;
+
+    while (1)
+    {
+	if (in->rp + 1 > in->wp)
+	{
+	    if (in->eof)
+		return fz_iodone;
+	    return fz_ioneedin;
+	}
+
+	if (out->wp + 1 > out->ep)
+	    return fz_ioneedout;
+
+	n = MIN(in->wp - in->rp, out->ep - out->wp);
+	if (n)
+	{
+	    memcpy(out->wp, in->rp, n);
+	    in->rp += n;
+	    out->wp += n;
+	}
+    }
+}
+
diff --git a/fitz/fitz_stream.h b/fitz/fitz_stream.h
index f1f3008a..ba0be332 100644
--- a/fitz/fitz_stream.h
+++ b/fitz/fitz_stream.h
@@ -248,7 +248,9 @@ void fz_unchainpipeline(fz_filter *pipe, fz_filter **oldfp, fz_buffer **oldbp);
 void fz_pushbackahxd(fz_filter *filter, fz_buffer *in, fz_buffer *out, int n);
 
 fz_error fz_newnullfilter(fz_filter **fp, int len);
+fz_error fz_newcopyfilter(fz_filter **fp);
 fz_error fz_newarc4filter(fz_filter **fp, unsigned char *key, unsigned keylen);
+fz_error fz_newaesdfilter(fz_filter **fp, unsigned char *key, unsigned keylen);
 fz_error fz_newa85d(fz_filter **filterp, fz_obj *param);
 fz_error fz_newa85e(fz_filter **filterp, fz_obj *param);
 fz_error fz_newahxd(fz_filter **filterp, fz_obj *param);
@@ -310,7 +312,26 @@ void fz_arc4init(fz_arc4 *state, const unsigned char *key, const unsigned len);
 unsigned char fz_arc4next(fz_arc4 *state);
 void fz_arc4encrypt(fz_arc4 *state, unsigned char *dest, const unsigned char *src, const unsigned len);
 
-/* TODO: aes */
+/* AES block cipher implementation from XYSSL */
+
+#define AES_DECRYPT 0
+#define AES_ENCRYPT 1
+
+struct fz_aes_s
+{
+	int nr;                     /* number of rounds */
+	unsigned long *rk;          /* AES round keys */
+	unsigned long buf[68];      /* unaligned data */
+};
+
+typedef struct fz_aes_s fz_aes;
+
+void aes_setkey_enc( fz_aes *ctx, const unsigned char *key, int keysize );
+void aes_setkey_dec( fz_aes *ctx, const unsigned char *key, int keysize );
+void aes_crypt_cbc( fz_aes *ctx, int mode, int length,
+                    unsigned char iv[16],
+                    const unsigned char *input,
+                    unsigned char *output );
 
 /*
  * Stream API for Fitz.
diff --git a/mupdf/mupdf.h b/mupdf/mupdf.h
index 26ca8d32..dab5b211 100644
--- a/mupdf/mupdf.h
+++ b/mupdf/mupdf.h
@@ -60,41 +60,54 @@ fz_error pdf_toucs2(unsigned short **dstp, fz_obj *src);
 #define PDF_DEFAULT_PERM_FLAGS  0xfffc
 
 typedef struct pdf_crypt_s pdf_crypt;
+typedef struct pdf_cryptfilter_s pdf_cryptfilter;
+typedef enum pdf_cryptmethod_e pdf_cryptmethod;
+
+enum pdf_cryptmethod_e
+{
+	PDF_CRYPT_NONE,
+	PDF_CRYPT_RC4,
+	PDF_CRYPT_AESV2,
+	PDF_CRYPT_UNKNOWN,
+};
+
+struct pdf_cryptfilter_s
+{
+	pdf_cryptmethod method;
+	int length;
+	unsigned char key[16];
+};
 
 struct pdf_crypt_s
 {
-	unsigned char o[32];
-	unsigned char u[32];
-	unsigned int p;
+	unsigned char idstring[32];
+	int idlength;
+
 	int v;
-	int r;
-	int len;
-	char *handler;
-	char *stmmethod;
-	int stmlength;
-	char *strmethod;
-	int strlength;
-	int encryptedmeta;
+	int length;
+	fz_obj *cf;
+	pdf_cryptfilter stmf;
+	pdf_cryptfilter strf;
 
-	fz_obj *encrypt;
-	fz_obj *id;
+	int r;
+	unsigned char o[32];
+	unsigned char u[32];
+	int p;
+	int encryptmetadata;
 
-	unsigned char key[16];
-	int keylen;
+	unsigned char key[32]; /* decryption key generated from password */
 };
 
 /* crypt.c */
-fz_error pdf_newdecrypt(pdf_crypt **cp, fz_obj *enc, fz_obj *id);
-fz_error pdf_newencrypt(pdf_crypt **cp, char *userpw, char *ownerpw, int p, int n, fz_obj *id);
+fz_error pdf_newcrypt(pdf_crypt **cp, fz_obj *enc, fz_obj *id);
+void pdf_freecrypt(pdf_crypt *crypt);
 
-int pdf_setpassword(pdf_crypt *crypt, char *pw);
-int pdf_setuserpassword(pdf_crypt *crypt, char *pw, int pwlen);
-int pdf_setownerpassword(pdf_crypt *crypt, char *pw, int pwlen);
+fz_error pdf_parsecryptfilter(pdf_cryptfilter *cf, fz_obj *dict, int defaultlength);
+fz_error pdf_cryptstream(fz_filter **fp, pdf_crypt *crypt, int num, int gen);
+void pdf_cryptobj(pdf_crypt *crypt, fz_obj *obj, int num, int gen);
 
-fz_error pdf_cryptstream(fz_filter **fp, pdf_crypt *crypt, int oid, int gen);
-void pdf_cryptbuffer(pdf_crypt *crypt, fz_buffer *buf, int oid, int gen);
-void pdf_cryptobj(pdf_crypt *crypt, fz_obj *obj, int oid, int gen);
-void pdf_freecrypt(pdf_crypt *crypt);
+int pdf_needspassword(pdf_xref *xref);
+int pdf_authenticatepassword(pdf_xref *xref, char *pw);
 
 /*
  * xref and object / stream api
@@ -135,6 +148,7 @@ fz_error pdf_newxref(pdf_xref **);
 fz_error pdf_repairxref(pdf_xref *, char *filename);
 fz_error pdf_loadxref(pdf_xref *, char *filename);
 fz_error pdf_initxref(pdf_xref *);
+fz_error pdf_decryptxref(pdf_xref *);
 
 void pdf_debugxref(pdf_xref *);
 void pdf_flushxref(pdf_xref *, int force);
@@ -155,7 +169,6 @@ fz_error pdf_transplant(pdf_xref *dst, pdf_xref *src, fz_obj **newp, fz_obj *old
 
 /* private */
 fz_error pdf_loadobjstm(pdf_xref *xref, int oid, int gen, char *buf, int cap);
-fz_error pdf_decryptxref(pdf_xref *xref);
 
 /*
  * Resource store
diff --git a/mupdf/pdf_crypt.c b/mupdf/pdf_crypt.c
index 35da028d..48ea1b39 100644
--- a/mupdf/pdf_crypt.c
+++ b/mupdf/pdf_crypt.c
@@ -1,559 +1,640 @@
 #include "fitz.h"
 #include "mupdf.h"
 
-static const unsigned char padding[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 void voodoo50(unsigned char *buf, int n)
-{
-	fz_md5 md5;
-	int i;
-
-	for (i = 0; i < 50; i++)
-	{
-		fz_md5init(&md5);
-		fz_md5update(&md5, buf, n);
-		fz_md5final(&md5, buf);
-	}
-}
-
-static void voodoo19(unsigned char *data, int ndata, unsigned char *key, int nkey)
-{
-	fz_arc4 arc4;
-	unsigned char keybuf[16];
-	int i, k;
-
-	for (i = 1; i <= 19; i++)
-	{
-		for (k = 0; k < nkey; k++)
-			keybuf[k] = key[k] ^ (unsigned char)i;
-		fz_arc4init(&arc4, keybuf, nkey);
-		fz_arc4encrypt(&arc4, data, data, ndata);
-	}
-}
-
-static void padpassword(unsigned char *buf, unsigned char *pw, int pwlen)
-{
-	if (pwlen > 32)
-		pwlen = 32;
-	memcpy(buf, pw, pwlen);
-	memcpy(buf + pwlen, padding, 32 - pwlen);
-}
+/*
+ * Create crypt object for decrypting strings and streams
+ * given the Encryption and ID objects.
+ */
 
-static fz_error
-pdf_parsecryptfilt(fz_obj *filters, char *filter, char **method, int *length)
+fz_error
+pdf_newcrypt(pdf_crypt **cryptp, fz_obj *dict, fz_obj *id)
 {
-	fz_obj *cryptfilt;
-	fz_obj *obj;
-
-	cryptfilt = fz_dictgets(filters, filter);
-	if (!fz_isdict(cryptfilt))
-		goto cleanup;
+    pdf_crypt *crypt;
+    fz_error error;
+    fz_obj *obj;
 
-	obj = fz_dictgets(cryptfilt, "CFM");
-	*method = "None";
-	if (fz_isname(obj))
-		*method = fz_toname(obj);
+    crypt = fz_malloc(sizeof(pdf_crypt));
+    if (!crypt)
+	return fz_rethrow(-1, "out of memory: crypt struct");
 
-	obj = fz_dictgets(cryptfilt, "Length");
-	*length = 40;
-	if (fz_isint(obj))
-		*length = fz_toint(obj);
-
-	/* Work-around to fix PDF-generators that assume that the
-	   length is specified in bytes instead of in bits */
-	if (*length < 40)
-		if (*length * 8 >= 40 && *length * 8 <= 128)
-			*length = *length * 8;
+    memset(crypt, 0x00, sizeof(pdf_crypt));
+    crypt->cf = nil;
 
-	return fz_okay;
+    /*
+     * Common to all security handlers (PDF 1.7 table 3.18)
+     */
 
-cleanup:
-	return fz_throw("corrupt encryption filter dictionary");
-}
-
-static fz_error
-pdf_parseencdict(pdf_crypt *crypt, fz_obj *enc)
-{
-	fz_obj *obj;
-	fz_error error = fz_okay;
-
-	obj = fz_dictgets(enc, "Filter");
-	if (!fz_isname(obj))
-		goto cleanup;
-	crypt->handler = fz_toname(obj);
+    obj = fz_dictgets(dict, "Filter");
+    if (!fz_isname(obj))
+    {
+	pdf_freecrypt(crypt);
+	return fz_throw("unspecified encryption handler");
+    }
+    if (strcmp(fz_toname(obj), "Standard") != 0)
+    {
+	pdf_freecrypt(crypt);
+	return fz_throw("unknown encryption handler: '%s'", fz_toname(obj));
+    }
+
+    crypt->v = 0;
+    obj = fz_dictgets(dict, "V");
+    if (fz_isint(obj))
+	crypt->v = fz_toint(obj);
+    if (crypt->v != 1 && crypt->v != 2 && crypt->v != 4)
+    {
+	pdf_freecrypt(crypt);
+	return fz_throw("unknown encryption version: %d", crypt->v);
+    }
 
-	obj = fz_dictgets(enc, "V");
-	crypt->v = 0;
+    crypt->length = 40;
+    if (crypt->v == 2 || crypt->v == 4)
+    {
+	obj = fz_dictgets(dict, "Length");
 	if (fz_isint(obj))
-		crypt->v = fz_toint(obj);
+	    crypt->length = fz_toint(obj);
 
-	obj = fz_dictgets(enc, "R");
-	if (!fz_isint(obj))
-		goto cleanup;
-	crypt->r = fz_toint(obj);
+	/* work-around for pdf generators that assume length is in bytes */
+	if (crypt->length < 40)
+	    crypt->length = crypt->length * 8;
 
-	if (crypt->v == 1)
+	if (crypt->length % 8 != 0)
 	{
-		crypt->len = 40;
+	    pdf_freecrypt(crypt);
+	    return fz_throw("invalid encryption key length: %d", crypt->length);
 	}
-	else if (crypt->v >= 2 && crypt->v <= 3)
+	if (crypt->length > 256)
 	{
-		obj = fz_dictgets(enc, "Length");
-		crypt->len = 40;
-		if (fz_isint(obj))
-			crypt->len = fz_toint(obj);
+	    pdf_freecrypt(crypt);
+	    return fz_throw("invalid encryption key length: %d", crypt->length);
 	}
-	else if (crypt->v == 4)
-	{
-		fz_obj *cryptfilt;
-		char *filt;
-
-		cryptfilt = fz_dictgets(enc, "CF");
-		if (cryptfilt && !fz_isdict(cryptfilt))
-			goto cleanup;
-
-		obj = fz_dictgets(enc, "StmF");
-		filt = "Identity";
-		if (fz_isname(obj))
-			filt = fz_toname(obj);
-
-		error = pdf_parsecryptfilt(cryptfilt, filt,
-				&crypt->stmmethod, &crypt->stmlength);
-		if (error)
-			goto cleanup;
-
-		obj = fz_dictgets(enc, "StrF");
-		filt = "Identity";
-		if (fz_isname(obj))
-			filt = fz_toname(obj);
-
-		error = pdf_parsecryptfilt(cryptfilt, filt,
-				&crypt->strmethod, &crypt->strlength);
-		if (error)
-			goto cleanup;
-
-		obj = fz_dictgets(enc, "EncryptMetadata");
-		crypt->encryptedmeta = 1;
-		if (fz_isbool(obj))
-			crypt->encryptedmeta = fz_tobool(obj);
-	}
-
-	obj = fz_dictgets(enc, "O");
-	if (!fz_isstring(obj) || fz_tostrlen(obj) != 32)
-		goto cleanup;
-	memcpy(crypt->o, fz_tostrbuf(obj), 32);
-
-	obj = fz_dictgets(enc, "U");
-	if (!fz_isstring(obj) || fz_tostrlen(obj) != 32)
-		goto cleanup;
-	memcpy(crypt->u, fz_tostrbuf(obj), 32);
-
-	obj = fz_dictgets(enc, "P");
-	if (!fz_isint(obj))
-		goto cleanup;
-	crypt->p = fz_toint(obj);
+    }
 
-	return fz_okay;
-
-cleanup:
-	if (error)
-		return fz_rethrow(error, "corrupt encryption dictionary");
+    if (crypt->v == 1 || crypt->v == 2)
+    {
+	crypt->stmf.method = PDF_CRYPT_RC4;
+	crypt->stmf.length = crypt->length;
 
-	return fz_throw("corrupt encryption dictionary");
-}
+	crypt->strf.method = PDF_CRYPT_RC4;
+	crypt->strf.length = crypt->length;
+    }
 
+    if (crypt->v == 4)
+    {
+	crypt->stmf.method = PDF_CRYPT_NONE;
+	crypt->stmf.length = crypt->length;
 
-/*
- * Create crypt object for decrypting given the
- * Encoding dictionary and file ID
- */
-fz_error
-pdf_newdecrypt(pdf_crypt **cp, fz_obj *enc, fz_obj *id)
-{
-	pdf_crypt *crypt;
-	fz_error error;
-	fz_obj *obj;
-
-	crypt = fz_malloc(sizeof(pdf_crypt));
-	if (!crypt)
-		return fz_rethrow(-1, "out of memory: crypt struct");
-
-	memset(crypt->o, 0x00, sizeof(crypt->o));
-	memset(crypt->u, 0x00, sizeof(crypt->u));
-	crypt->p = 0;
-	crypt->v = 0;
-	crypt->r = 0;
-	crypt->len = 0;
-	crypt->handler = nil;
-	crypt->stmmethod = nil;
-	crypt->stmlength = 0;
-	crypt->strmethod = nil;
-	crypt->strlength = 0;
-	crypt->encryptedmeta = 0;
-
-	crypt->encrypt = fz_keepobj(enc);
-	crypt->id = nil;
-
-	memset(crypt->key, 0x00, sizeof(crypt->key));
-	crypt->keylen = 0;
-
-	error = pdf_parseencdict(crypt, enc);
-	if (error)
-	{
-		pdf_freecrypt(crypt);
-		return fz_rethrow(error, "unable to to create decryptor");
-	}
+	crypt->strf.method = PDF_CRYPT_NONE;
+	crypt->strf.length = crypt->length;
 
-	if (strcmp(crypt->handler, "Standard") != 0)
+	obj = fz_dictgets(dict, "CF");
+	if (fz_isdict(obj))
 	{
-		char *handler = crypt->handler;
-		pdf_freecrypt(crypt);
-		return fz_throw("unsupported security handler: %s", handler);
-	}
-
-	if (crypt->v == 4)
-	{
-		if (crypt->stmmethod && strcmp(crypt->stmmethod, "V2") != 0)
+	    crypt->cf = fz_keepobj(obj);
+
+	    obj = fz_dictgets(dict, "StmF");
+	    if (fz_isname(obj))
+	    {
+		/* should verify that it is either Identity or StdCF */
+		obj = fz_dictgets(crypt->cf, fz_toname(obj));
+		if (fz_isdict(obj))
 		{
-			char *method = crypt->stmmethod;
+		    error = pdf_parsecryptfilter(&crypt->stmf, obj, crypt->length);
+		    if (error)
+		    {
 			pdf_freecrypt(crypt);
-			return fz_throw("unsupported stream encryption method: %s", method);
+			return fz_rethrow(error, "cannot parse stream crypt filter");
+		    }
 		}
-
-		if (crypt->strmethod && strcmp(crypt->strmethod, "V2") != 0)
+	    }
+
+	    obj = fz_dictgets(dict, "StrF");
+	    if (fz_isname(obj))
+	    {
+		/* should verify that it is either Identity or StdCF */
+		obj = fz_dictgets(crypt->cf, fz_toname(obj));
+		if (fz_isdict(obj))
 		{
-			char *method = crypt->strmethod;
+		    error = pdf_parsecryptfilter(&crypt->strf, obj, crypt->length);
+		    if (error)
+		    {
 			pdf_freecrypt(crypt);
-			return fz_throw("unsupported string encryption: %s", method);
+			return fz_rethrow(error, "cannot parse string crypt filter");
+		    }
 		}
+	    }
+	}
+    }
 
-		if (crypt->stmlength != crypt->strlength)
-		{
-			int stmlength = crypt->stmlength;
-			int strlength = crypt->strlength;
-			pdf_freecrypt(crypt);
-			return fz_throw("unsupport encryption key lengths: %d vs. %d", stmlength, strlength);
-		}
+    /*
+     * Standard security handler (PDF 1.7 table 3.19)
+     */
 
-		crypt->len = crypt->stmlength;
-	}
+    obj = fz_dictgets(dict, "R");
+    if (fz_isint(obj))
+	crypt->r = fz_toint(obj);
+    else
+    {
+	pdf_freecrypt(crypt);
+	return fz_throw("encryption dictionary missing revision value");
+    }
 
-	if (crypt->len % 8 != 0)
-		goto cleanup;
-	crypt->len = crypt->len / 8;
+    obj = fz_dictgets(dict, "O");
+    if (fz_isstring(obj) && fz_tostrlen(obj) == 32)
+	memcpy(crypt->o, fz_tostrbuf(obj), 32);
+    else
+    {
+	pdf_freecrypt(crypt);
+	return fz_throw("encryption dictionary missing owner password");
+    }
 
-	if (crypt->v == 1 && crypt->len != 5) goto cleanup;
-	if (crypt->v == 2 && crypt->len < 5) goto cleanup;
-	if (crypt->v == 3 && (crypt->len < 5 || crypt->len > 16)) goto cleanup;
-	if (crypt->v == 4 && (crypt->len < 5 || crypt->len > 16)) goto cleanup;
+    obj = fz_dictgets(dict, "U");
+    if (fz_isstring(obj) && fz_tostrlen(obj) == 32)
+	memcpy(crypt->u, fz_tostrbuf(obj), 32);
+    else
+    {
+	pdf_freecrypt(crypt);
+	return fz_throw("encryption dictionary missing user password");
+    }
 
-	if (crypt->v < 1 || crypt->v > 4)
-	{
-		pdf_freecrypt(crypt);
-		return fz_throw("unsupported encryption algorithm: %d", crypt->v);
-	}
+    obj = fz_dictgets(dict, "P");
+    if (fz_isint(obj))
+	crypt->p = fz_toint(obj);
+    else
+    {
+	pdf_freecrypt(crypt);
+	return fz_throw("encryption dictionary missing permissions value");
+    }
 
-	if (fz_isarray(id) && fz_arraylen(id) == 2)
-	{
-		obj = fz_arrayget(id, 0);
-		if (fz_isstring(obj))
-			crypt->id = fz_keepobj(obj);
-	}
+    crypt->encryptmetadata = 1;
+    obj = fz_dictgets(dict, "EncryptMetadata");
+    if (fz_isbool(obj))
+	crypt->encryptmetadata = fz_tobool(obj);
 
-	crypt->keylen = crypt->len + 5;
-	if (crypt->keylen > 16)
-		crypt->keylen = 16;
+    /*
+     * Extract file identifier string
+     */
 
-	memset(crypt->key, 0, 16);
+    crypt->idlength = 0;
 
-	*cp = crypt;
-	return fz_okay;
+    if (fz_isarray(id) && fz_arraylen(id) == 2)
+    {
+	obj = fz_arrayget(id, 0);
+	if (fz_isstring(obj))
+	{
+	    if (fz_tostrlen(obj) <= sizeof(crypt->idstring))
+	    {
+		memcpy(crypt->idstring, fz_tostrbuf(obj), fz_tostrlen(obj));
+		crypt->idlength = fz_tostrlen(obj);
+	    }
+	}
+    }
 
-cleanup:
+    if (crypt->idlength == 0)
+    {
 	pdf_freecrypt(crypt);
-	return fz_throw("corrupt encryption dictionary");
+	return fz_throw("missing file identifier");
+    }
+
+#if 0
+    {
+	int i;
+	printf("crypt: v=%d length=%d\n", crypt->v, crypt->length);
+	printf("crypt: stmf method=%d length=%d\n", crypt->stmf.method, crypt->stmf.length);
+	printf("crypt: strf method=%d length=%d\n", crypt->strf.method, crypt->strf.length);
+	printf("crypt: r=%d\n", crypt->r);
+	printf("crypt: o=<"); for (i = 0; i < 32; i++) printf("%02X", crypt->o[i]); printf(">\n");
+	printf("crypt: u=<"); for (i = 0; i < 32; i++) printf("%02X", crypt->u[i]); printf(">\n");
+	printf("crypt: p=0x%08X\n", crypt->p);
+    }
+#endif
+
+    *cryptp = crypt;
+    return fz_okay;
 }
 
 void
 pdf_freecrypt(pdf_crypt *crypt)
 {
-	if (crypt->encrypt) fz_dropobj(crypt->encrypt);
-	if (crypt->id) fz_dropobj(crypt->id);
-	fz_free(crypt);
+    if (crypt->cf) fz_dropobj(crypt->cf);
+    fz_free(crypt);
 }
 
-static void
-createobjkey(pdf_crypt *crypt, unsigned oid, unsigned gen, unsigned char *key)
-{
-	unsigned char message[5];
-	fz_md5 md5;
+/*
+ * Parse a CF dictionary entry (PDF 1.7 table 3.22)
+ */
 
-	/* Algorithm 3.1 Encryption of data using an encryption key */
+fz_error
+pdf_parsecryptfilter(pdf_cryptfilter *cf, fz_obj *dict, int defaultlength)
+{
+    fz_obj *obj;
+
+    cf->method = PDF_CRYPT_NONE;
+    cf->length = defaultlength;
+
+    obj = fz_dictgets(dict, "CFM");
+    if (fz_isname(obj))
+    {
+	if (!strcmp(fz_toname(obj), "None"))
+	    cf->method = PDF_CRYPT_NONE;
+	else if (!strcmp(fz_toname(obj), "V2"))
+	    cf->method = PDF_CRYPT_RC4;
+	else if (!strcmp(fz_toname(obj), "AESV2"))
+	    cf->method = PDF_CRYPT_AESV2;
+	else
+	    fz_throw("unknown encryption method: %s", fz_toname(obj));
+    }
+
+    obj = fz_dictgets(dict, "Length");
+    if (fz_isint(obj))
+	cf->length = fz_toint(obj);
+
+    if ((cf->length % 8) != 0)
+	return fz_throw("invalid key length: %d", cf->length);
+
+    return fz_okay;
+}
 
-	fz_md5init(&md5);
+/*
+ * Compute an encryption key (PDF 1.7 algorithm 3.2)
+ */
 
-	fz_md5update(&md5, crypt->key, crypt->len);
+static const unsigned char padding[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
+};
 
-	message[0] = oid & 0xFF;
-	message[1] = (oid >> 8) & 0xFF;
-	message[2] = (oid >> 16) & 0xFF;
+static void
+pdf_computeencryptionkey(pdf_crypt *crypt, unsigned char *password, int pwlen, unsigned char *key)
+{
+    unsigned char buf[32];
+    unsigned int p;
+    int i, n;
+    fz_md5 md5;
+
+    n = crypt->length / 8;
+
+    /* Step 1 - copy and pad password string */
+    if (pwlen > 32)
+	pwlen = 32;
+    memcpy(buf, password, pwlen);
+    memcpy(buf + pwlen, padding, 32 - pwlen);
+
+    /* Step 2 - init md5 and pass value of step 1 */
+    fz_md5init(&md5);
+    fz_md5update(&md5, buf, 32);
+
+    /* Step 3 - pass O value */
+    fz_md5update(&md5, crypt->o, 32);
+
+    /* Step 4 - pass P value as unsigned int, low-order byte first */
+    p = (unsigned int) crypt->p;
+    buf[0] = (p) & 0xFF;
+    buf[1] = (p >> 8) & 0xFF;
+    buf[2] = (p >> 16) & 0xFF;
+    buf[3] = (p >> 24) & 0xFF;
+    fz_md5update(&md5, buf, 4);
+
+    /* Step 5 - pass first element of ID array */
+    fz_md5update(&md5, crypt->idstring, crypt->idlength);
+
+    /* Step 6 (revision 4 or greater) - if metadata is not encrypted pass 0xFFFFFFFF */
+    if (crypt->r >= 4)
+    {
+	if (!crypt->encryptmetadata)
+	{
+	    buf[0] = 0xFF;
+	    buf[1] = 0xFF;
+	    buf[2] = 0xFF;
+	    buf[3] = 0xFF;
+	    fz_md5update(&md5, buf, 4);
+	}
+    }
 
-	message[3] = gen & 0xFF;
-	message[4] = (gen >> 8) & 0xFF;
+    /* Step 7 - finish the hash */
+    fz_md5final(&md5, buf);
 
-	fz_md5update(&md5, message, 5);
+    /* Step 8 (revision 3 or greater) - do some voodoo 50 times */
+    if (crypt->r >= 3)
+    {
+	for (i = 0; i < 50; i++)
+	{
+	    fz_md5init(&md5);
+	    fz_md5update(&md5, buf, n);
+	    fz_md5final(&md5, buf);
+	}
+    }
 
-	fz_md5final(&md5, key);
+    /* Step 9 - the key is the first 'n' bytes of the result */
+    memcpy(key, buf, n);
 }
 
 /*
- * Algorithm 3.2 Computing an encryption key as of pdf 1.7
+ * Computing the user password (PDF 1.7 algorithm 3.4 and 3.5)
+ * Also save the generated key for decrypting objects and streams in crypt->key.
  */
+
 static void
-createkey(pdf_crypt *crypt, unsigned char *userpw, int pwlen)
+pdf_computeuserpassword(pdf_crypt *crypt, unsigned char *password, int pwlen, unsigned char *output)
 {
-	unsigned char buf[32];
+    if (crypt->r == 2)
+    {
+	fz_arc4 arc4;
+
+	pdf_computeencryptionkey(crypt, password, pwlen, crypt->key);
+	fz_arc4init(&arc4, crypt->key, crypt->length / 8);
+	fz_arc4encrypt(&arc4, output, padding, 32);
+    }
+
+    if (crypt->r >= 3)
+    {
+	unsigned char xor[32];
+	unsigned char digest[16];
 	fz_md5 md5;
+	fz_arc4 arc4;
+	int i, x, n;
 
-	/* Step 1 + 2 */
-	fz_md5init(&md5);
-	padpassword(buf, userpw, pwlen);
-	fz_md5update(&md5, buf, 32);
+	n = crypt->length / 8;
 
-	/* Step 3 */
-	fz_md5update(&md5, crypt->o, 32);
+	pdf_computeencryptionkey(crypt, password, pwlen, crypt->key);
 
-	/* Step 4 */
-	buf[0] = crypt->p & 0xFF;
-	buf[1] = (crypt->p >> 8) & 0xFF;
-	buf[2] = (crypt->p >> 16) & 0xFF;
-	buf[3] = (crypt->p >> 24) & 0xFF;
-	fz_md5update(&md5, buf, 4);
+	fz_md5init(&md5);
+	fz_md5update(&md5, padding, 32);
+	fz_md5update(&md5, crypt->idstring, crypt->idlength);
+	fz_md5final(&md5, digest);
 
-	/* Step 5 */
-	fz_md5update(&md5, (unsigned char *) fz_tostrbuf(crypt->id),
-		fz_tostrlen(crypt->id));
+	fz_arc4init(&arc4, crypt->key, n);
+	fz_arc4encrypt(&arc4, output, digest, 16);
 
-	/* Step 6 (rev 4 or later) */
-	if (crypt->r >= 4 && !crypt->encryptedmeta)
+	for (x = 1; x <= 19; x++)
 	{
-		memset(buf, 0xff, 4);
-		fz_md5update(&md5, buf, 4);
+	    for (i = 0; i < n; i++)
+		xor[i] = crypt->key[i] ^ x;
+	    fz_arc4init(&arc4, xor, n);
+	    fz_arc4encrypt(&arc4, output, output, 16);
 	}
 
-	/* Step 7 */
-	fz_md5final(&md5, crypt->key);
+	memcpy(output + 16, padding, 16);
+    }
+}
 
-	/* Step 8 (rev 3, or later) */
-	if (crypt->r >= 3)
-		voodoo50(crypt->key, crypt->len);
+/*
+ * Authenticating the user password (PDF 1.7 algorithm 3.6)
+ * This also has the side effect of saving a key generated
+ * from the password for decrypting objects and streams.
+ */
 
-	/* Step 9: key is in crypt->key */
+static int
+pdf_authenticateuserpassword(pdf_crypt *crypt, unsigned char *password, int pwlen)
+{
+    unsigned char output[32];
+    pdf_computeuserpassword(crypt, password, pwlen, output);
+    if (crypt->r == 2)
+	return memcmp(output, crypt->u, 32) == 0;
+    if (crypt->r >= 3)
+	return memcmp(output, crypt->u, 16) == 0;
+    return 0;
 }
 
 /*
- * Algorithm 3.4 Computing the U value (rev 2)
- * Algorithm 3.5 Computing the U value (rev 3 or later)
+ * Authenticating the owner password (PDF 1.7 algorithm 3.7)
+ * Generates the user password from the owner password
+ * and calls pdf_authenticateuserpassword.
  */
-static void
-createuser(pdf_crypt *crypt, unsigned char *userpw, int pwlen)
-{
-	unsigned char key[16];
-	fz_arc4 arc4;
-	fz_md5 md5;
 
-	if (crypt->r == 2)
+static int
+pdf_authenticateownerpassword(pdf_crypt *crypt, unsigned char *ownerpass, int pwlen)
+{
+    unsigned char pwbuf[32];
+    unsigned char key[32];
+    unsigned char xor[32];
+    unsigned char userpass[32];
+    int i, n, x;
+    fz_md5 md5;
+    fz_arc4 arc4;
+
+    n = crypt->length / 8;
+
+    /* Step 1 -- steps 1 to 4 of PDF 1.7 algorithm 3.3 */
+
+    /* copy and pad password string */
+    if (pwlen > 32)
+	pwlen = 32;
+    memcpy(pwbuf, ownerpass, pwlen);
+    memcpy(pwbuf + pwlen, padding, 32 - pwlen);
+
+    /* take md5 hash of padded password */
+    fz_md5init(&md5);
+    fz_md5update(&md5, pwbuf, 32);
+    fz_md5final(&md5, key);
+
+    /* do some voodoo 50 times (Revision 3 or greater) */
+    if (crypt->r >= 3)
+    {
+	for (i = 0; i < 50; i++)
 	{
-		createkey(crypt, userpw, pwlen);
-		fz_arc4init(&arc4, crypt->key, crypt->len);
-		fz_arc4encrypt(&arc4, crypt->u, padding, 32);
+	    fz_md5init(&md5);
+	    fz_md5update(&md5, key, 16);
+	    fz_md5final(&md5, key);
 	}
-
-	if (crypt->r >= 3)
+    }
+
+    /* Step 2 (Revision 2) */
+    if (crypt->r == 2)
+    {
+	fz_arc4init(&arc4, key, n);
+	fz_arc4encrypt(&arc4, userpass, crypt->o, 32);
+    }
+
+    /* Step 2 (Revision 3 or greater) */
+    if (crypt->r >= 3)
+    {
+	memcpy(userpass, crypt->o, 32);
+	for (x = 0; x < 20; x++)
 	{
-		/* Step 1 */
-		createkey(crypt, userpw, pwlen);
-
-		/* Step 2 */
-		fz_md5init(&md5);
-		fz_md5update(&md5, padding, 32);
-
-		/* Step 3 */
-		fz_md5update(&md5, (unsigned char *) fz_tostrbuf(crypt->id),
-			fz_tostrlen(crypt->id));
-		fz_md5final(&md5, key);
+	    for (i = 0; i < n; i++)
+		xor[i] = key[i] ^ (19 - x);
+	    fz_arc4init(&arc4, xor, n);
+	    fz_arc4encrypt(&arc4, userpass, userpass, 32);
+	}
+    }
 
-		/* Step 4 */
-		fz_arc4init(&arc4, crypt->key, crypt->len);
-		fz_arc4encrypt(&arc4, key, key, 16);
+    return pdf_authenticateuserpassword(crypt, userpass, 32);
+}
 
-		/* Step 5 */
-		voodoo19(key, 16, crypt->key, crypt->len);
 
-		/* Step 6 */
-		memcpy(crypt->u, key, 16);
-		memset(crypt->u + 16, 0, 16);
-	}
+int
+pdf_authenticatepassword(pdf_xref *xref, char *password)
+{
+    if (xref->crypt)
+    {
+	if (pdf_authenticateuserpassword(xref->crypt, (unsigned char *)password, strlen(password)))
+	    return 1;
+	if (pdf_authenticateownerpassword(xref->crypt, (unsigned char *)password, strlen(password)))
+	    return 1;
+	return 0;
+    }
+    return 1;
 }
 
 int
-pdf_setpassword(pdf_crypt *crypt, char *pw)
+pdf_needspassword(pdf_xref *xref)
 {
-	int okay = pdf_setuserpassword(crypt, pw, strlen(pw));
-	if (!okay)
-	{
-		okay = pdf_setownerpassword(crypt, pw, strlen(pw));
-		if (!okay)
-			return 0;
-	}
-
-	return 1;
+    if (!xref->crypt)
+	return 0;
+    if (pdf_authenticatepassword(xref, ""))
+	return 0;
+    return 1;
 }
 
 /*
- * Alorithm 3.6 Authenticating the user password as of pdf 1.7
+ * PDF 1.7 algorithm 3.1
+ *
+ * Using the global encryption key that was generated from the
+ * password, create a new key that is used to decrypt indivual
+ * objects and streams. This key is based on the object and
+ * generation numbers.
  */
-int
-pdf_setuserpassword(pdf_crypt *crypt, char *userpw, int pwlen)
-{
-	unsigned char saved[32];
-	unsigned char test[32];
-
-	/* Step 1 */
-	memcpy(saved, crypt->u, 32);
-	createuser(crypt, (unsigned char *) userpw, pwlen);
-	memcpy(test, crypt->u, 32);
-	memcpy(crypt->u, saved, 32);
 
-	/* Step 2 */
-	if (memcmp(test, saved, crypt->r >= 3 ? 16 : 32) != 0)
-		return 0;
-
-	return 1;
+static int
+pdf_computeobjectkey(pdf_crypt *crypt, pdf_cryptfilter *cf, int num, int gen, unsigned char *key)
+{
+    fz_md5 md5;
+    unsigned char message[5];
+
+    fz_md5init(&md5);
+    fz_md5update(&md5, crypt->key, crypt->length / 8);
+    message[0] = (num) & 0xFF;
+    message[1] = (num >> 8) & 0xFF;
+    message[2] = (num >> 16) & 0xFF;
+    message[3] = (gen) & 0xFF;
+    message[4] = (gen >> 8) & 0xFF;
+    fz_md5update(&md5, message, 5);
+
+    if (cf->method == PDF_CRYPT_AESV2)
+	fz_md5update(&md5, (unsigned char *)"sAlT", 4);
+
+    fz_md5final(&md5, key);
+
+    if (crypt->length / 8 + 5 > 16)
+	return 16;
+    return crypt->length / 8 + 5;
 }
 
 /*
- * Algorithm 3.7 Authenticating the owner password as of pdf 1.7
+ * PDF 1.7 algorithm 3.1
+ *
+ * Decrypt all strings in obj modifying the data in-place.
+ * Recurse through arrays and dictionaries, but do not follow
+ * indirect references.
  */
-int
-pdf_setownerpassword(pdf_crypt *crypt, char *ownerpw, int pwlen)
-{
-	unsigned char saved[32];
-	unsigned char test[32];
-	unsigned char buf[32];
-	unsigned char key[16];
-	fz_arc4 arc4;
-	fz_md5 md5;
 
-	/* Step 1 */
-	/* Algorithm 3.3 Step 1 + 2 */
-	padpassword(buf, (unsigned char *) ownerpw, pwlen);
-	fz_md5init(&md5);
-	fz_md5update(&md5, buf, 32);
-	fz_md5final(&md5, key);
+static void
+pdf_cryptobjimp(pdf_crypt *crypt, fz_obj *obj, unsigned char *key, int keylen)
+{
+    unsigned char *s;
+    int i, n;
 
-	/* Algorithm 3.3 Step 3 (rev 3 or later) */
-	if (crypt->r >= 3)
-		voodoo50(key, crypt->len);
+    if (fz_isindirect(obj))
+	return;
 
-	/* Step 2 */
-	fz_arc4init(&arc4, key, crypt->len);
+    if (fz_isstring(obj))
+    {
+	s = (unsigned char *) fz_tostrbuf(obj);
+	n = fz_tostrlen(obj);
 
-	if (crypt->r == 2)
+	if (crypt->strf.method == PDF_CRYPT_RC4)
 	{
-		fz_arc4encrypt(&arc4, buf, crypt->o, 32);
+	    fz_arc4 arc4;
+	    fz_arc4init(&arc4, key, keylen);
+	    fz_arc4encrypt(&arc4, s, s, n);
 	}
-	if (crypt->r >= 3)
-	{
-		unsigned char keyxor[16];
-		int i;
-		int k;
-
-		memcpy(buf, crypt->o, 32);
 
-		for(i = 19; i >= 0; --i)
-		{
-			for(k = 0; k < crypt->keylen; ++k)
-				keyxor[k] = key[k] ^ i;
-			fz_arc4init(&arc4, keyxor, crypt->keylen);
-			fz_arc4encrypt(&arc4, buf, buf, 32);
-		}
+	if (crypt->strf.method == PDF_CRYPT_AESV2)
+	{
+	    if (n >= 32)
+	    {
+		unsigned char iv[16];
+		fz_aes aes;
+		memcpy(iv, s, 16);
+		aes_setkey_dec(&aes, key, keylen * 8);
+		aes_crypt_cbc(&aes, AES_DECRYPT, n - 16, iv, s + 16, s);
+		obj->u.s.len -= 16; /* delete space used for iv */
+		obj->u.s.len -= s[n - 17]; /* delete padding bytes at end */
+	    }
 	}
+    }
 
-	/* Step 3 */
-	/* Algorithm 3.6 Step 1 */
-	memcpy(saved, crypt->u, 32);
-	createuser(crypt, buf, 32);
-	memcpy(test, crypt->u, 32);
-	memcpy(crypt->u, saved, 32);
-
-	/* Algorithm 3.6 Step 2 */
-	if (memcmp(test, saved, crypt->r >= 3 ? 16 : 32) != 0)
-		return 0;
+    else if (fz_isarray(obj))
+    {
+	n = fz_arraylen(obj);
+	for (i = 0; i < n; i++)
+	{
+	    pdf_cryptobjimp(crypt, fz_arrayget(obj, i), key, keylen);
+	}
+    }
 
-	return 1;
+    else if (fz_isdict(obj))
+    {
+	n = fz_dictlen(obj);
+	for (i = 0; i < n; i++)
+	{
+	    pdf_cryptobjimp(crypt, fz_dictgetval(obj, i), key, keylen);
+	}
+    }
 }
 
-/*
- * Recursively (and destructively!) de/encrypt all strings in obj
- */
 void
-pdf_cryptobj(pdf_crypt *crypt, fz_obj *obj, int oid, int gen)
+pdf_cryptobj(pdf_crypt *crypt, fz_obj *obj, int num, int gen)
 {
-	fz_arc4 arc4;
-	unsigned char key[16];
-	unsigned char *s;
-	int i, n;
+    unsigned char key[16];
+    int len;
 
-	if (fz_isindirect(obj))
-		return;
+    len = pdf_computeobjectkey(crypt, &crypt->strf, num, gen, key);
 
-	if (fz_isstring(obj))
-	{
-		s = (unsigned char *) fz_tostrbuf(obj);
-		n = fz_tostrlen(obj);
-		createobjkey(crypt, oid, gen, key);
-		fz_arc4init(&arc4, key, crypt->keylen);
-		fz_arc4encrypt(&arc4, s, s, n);
-	}
-
-	else if (fz_isarray(obj))
-	{
-		n = fz_arraylen(obj);
-		for (i = 0; i < n; i++)
-		{
-			pdf_cryptobj(crypt, fz_arrayget(obj, i), oid, gen);
-		}
-	}
-
-	else if (fz_isdict(obj))
-	{
-		n = fz_dictlen(obj);
-		for (i = 0; i < n; i++)
-		{
-			pdf_cryptobj(crypt, fz_dictgetval(obj, i), oid, gen);
-		}
-	}
+    pdf_cryptobjimp(crypt, obj, key, len);
 }
 
 /*
- * Create filter suitable for de/encrypting a stream
+ * PDF 1.7 algorithm 3.1
+ *
+ * Create filter suitable for de/encrypting a stream.
  */
 fz_error
-pdf_cryptstream(fz_filter **fp, pdf_crypt *crypt, int oid, int gen)
+pdf_cryptstream(fz_filter **fp, pdf_crypt *crypt, int num, int gen)
 {
-	fz_error error;
-	unsigned char key[16];
-	createobjkey(crypt, oid, gen, key);
-	error = fz_newarc4filter(fp, key, crypt->keylen);
+    fz_error error;
+    unsigned char key[16];
+    int len;
+
+    len = pdf_computeobjectkey(crypt, &crypt->stmf, num, gen, key);
+
+    if (crypt->stmf.method == PDF_CRYPT_NONE)
+    {
+	error = fz_newcopyfilter(fp);
 	if (error)
-		return fz_rethrow(error, "cannot create crypt filter");
+	    return fz_rethrow(error, "cannot create null crypt filter");
 	return fz_okay;
+    }
+
+    if (crypt->stmf.method == PDF_CRYPT_RC4)
+    {
+	error = fz_newarc4filter(fp, key, len);
+	if (error)
+	    return fz_rethrow(error, "cannot create RC4 crypt filter");
+	return fz_okay;
+    }
+
+    if (crypt->stmf.method == PDF_CRYPT_AESV2)
+    {
+	error = fz_newaesdfilter(fp, key, len);
+	if (error)
+	    return fz_rethrow(error, "cannot create AES crypt filter");
+	return fz_okay;
+    }
+
+    return fz_throw("unknown crypt method");
 }
 
diff --git a/mupdf/pdf_xref.c b/mupdf/pdf_xref.c
index 2966bb61..0c9c27cf 100644
--- a/mupdf/pdf_xref.c
+++ b/mupdf/pdf_xref.c
@@ -134,7 +134,6 @@ pdf_debugxref(pdf_xref *xref)
 	}
 }
 
-/* ICKY! */
 fz_error
 pdf_decryptxref(pdf_xref *xref)
 {
@@ -150,7 +149,7 @@ pdf_decryptxref(pdf_xref *xref)
 		if (fz_isnull(encrypt))
 			return fz_okay;
 
-		error = pdf_newdecrypt(&xref->crypt, encrypt, id);
+		error = pdf_newcrypt(&xref->crypt, encrypt, id);
 		if (error)
 			return fz_rethrow(error, "cannot create decrypter");
 	}