home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Enigma Amiga Life 110
/
EnigmaAmiga110CD.iso
/
indispensabili
/
utility
/
apdf
/
xpdf-0.80
/
decrypt_patch.diff
< prev
next >
Wrap
Text File
|
1999-07-08
|
96KB
|
1,981 lines
--- xpdf-0.80-decrypt.patch.orig Thu Jul 8 17:05:58 1999
+++ xpdf-0.80-decrypt.patch Thu Jul 8 17:05:48 1999
@@ -1,12 +1,1424 @@
-xpdf version 0.80 - Derek B. Noonburg
-Decryption patch Leo J.B. Smiers
-Decryption reworked for xpdf-0.80
-Tony Nugent <Tony.Nugent@usq.edu.au>
-December 1998
-
-diff -urN xpdf-0.80.orig/xpdf/Makefile.in xpdf-0.80/xpdf/Makefile.in
---- xpdf-0.80.orig/xpdf/Makefile.in Sat Nov 28 13:49:23 1998
-+++ xpdf-0.80/xpdf/Makefile.in Wed Dec 16 17:03:00 1998
+diff -u -b -B -r -N -w xpdf-0.80/README.decryption xpdf-0.80-decrypt/README.decryption
+--- xpdf-0.80/README.decryption Thu Jan 1 00:00:00 1970
++++ xpdf-0.80-decrypt/README.decryption Wed Jul 7 21:06:59 1999
+@@ -0,0 +1,103 @@
++xpdf version 0.80 with decryption patches
++
++With the release of version 0.80 of xpdf, I have retaken the decryption patch
++for this new version.
++
++Due to the changes that came with the 0.80 release, some re-working of parts of
++the decryption code became necessary in order to make it all work.
++
++Most of the comments (below) for version 0.7a still apply.
++
++DISCLAIMER: I know next to nothing about decryption. All I did was hack the
++code to make it work.
++
++Tony Nugent <Tony.Nugent@usq.edu.au>
++December 1998
++
++==========================================================================
++
++xpdf version 0.7a with decryption patches
++
++Author: Derek B. Noonburg <derekn@foolabs.com>
++URL: http://www.foolabs.com/xpdf/
++Sources: ftp://ftp.foolabs.com/pub/xpdf/xpdf-0.7a.tar.gz
++ ftp://ftp.foolabs.com/pub/xpdf/xpdf-0.7a-patch1
++ ftp://ftp.foolabs.com/pub/xpdf/xpdf-0.7a-patch2
++ ftp://ftp.sci.usq.edu.au/pub/linux/xpdf/xpdf-0.7a-patch3
++Packager: Tony Nugent <Tony.Nugent@usq.edu.au>
++
++This is a xpdf version 0.7a, but with the Makefile, divide-by-zero, and
++decryption patches added to it.
++
++For the reasons why xpdf, as distributed, is not capable of handling
++encrypted pdf files, please see:
++
++http://www.foolabs.com/xpdf/decryption.html
++
++What I have done is to add the decryption patches, and make all the sources
++available in a place off the US continent.
++
++This was born out of personal necessity... I had an encrypted pdf file that
++I *HAD* to read, so I went off to get the decryption patches for it from:
++
++http://people.a2000.nl/lsmiers/pdf/xpdf.html
++
++The patches were made available by Leo Smiers <L.Smiers@cable.A2000.nl> (in
++Europe, a place that also avoids problems with the senseless US exportation
++laws on encryption code). Everything that was needed was in a file called
++"encryption.tar.gz", but I found that they didn't apply easily or cleanly,
++and it also involved "dropping in" some files into the xpdf source tree.
++
++Once I got it working, I simply retook the patch again so that all the
++source files and patches were all included in one file.
++
++Now all that is needed is "patch -p1 < patchfile" and everything is done.
++(Then you "configure" and "make" as usual).
++
++I then grabbed xpdf-0.7a-1.src.rpm from RedHat's "rawhide" ("5.2-beta")
++distribution and made some minor changes to it so that a decryption-capable
++version could be easily rebuilt from a .spec file.
++
++So that's what I did, and this is the result. It seems to work just fine.
++
++I did some minor changes to RedHat's .spec file in the rpm so that it is
++installed into /usr/X11R6/bin rather than /usr/bin and also to put the
++ANNOUNCE file into the /usr/doc/xpdf-0.7a/ directory.
++
++I have contacted Derek (the author of xpdf) and got his blessing for what
++I've done. I've also tried to contact Leo (from who's web site I got the
++decryption patches), but in almost two months he has not replied.
++
++I wrote this README file to document what I've done, then did some
++some teaking of the rpm spec file to get this added to the installation
++documation directory.
++
++From my understanding of the US laws on the export of encryption code,
++export of the sources for this patched version of the package is not
++permitted from the United States in electronic format. (If you do this,
++you are considered to be an arms dealer!) As I understand it, the
++restrictions apply to taking such code *out* of the US in electronic
++format, not importing it nor taking it out in printed format.
++
++I don't live in the United States and we don't have silly laws like this
++here in Australia, so I can do what I like with these sources.
++
++I'm quite happy to put the resulting patch and the source and (glibc6)
++binary RPM files up on our web site and ftp server for general
++distribution.
++
++I will submitted the rpm packages to RedHat, leaving it up to them to do
++what they want (err... can) with it. They might be able to use the binary
++version, but the probably won't be legally able to redistribute it (to
++places outside the US).
++
++Derek's web pages for xpdf are an excellent resource which I would strongly
++recommend a visit to it:
++
++http://www.foolabs.com/xpdf/
++
++ -=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-
++ Tony Nugent <Tony.Nugent@usq.edu.au> <linux@usq.edu.au>
++ Computer Systems Officer Faculty of Science
++ University of Southern Queensland, Toowoomba Oueensland Australia
++ -=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-
+diff -u -b -B -r -N -w xpdf-0.80/build020/xpdf/Makefile xpdf-0.80-decrypt/build020/xpdf/Makefile
+--- xpdf-0.80/build020/xpdf/Makefile Thu Jun 24 18:18:46 1999
++++ xpdf-0.80-decrypt/build020/xpdf/Makefile Wed Jul 7 21:07:00 1999
+@@ -59,7 +59,9 @@
+ $(srcdir)/AOutputDev.cc \
+ $(srcdir)/FontOutputDev.cc \
+ $(srcdir)/AGfx.cc \
+- $(srcdir)/poly.cc
++ $(srcdir)/poly.cc \
++ $(srcdir)/md5.cc \
++ $(srcdir)/rc4.cc
+
+ #------------------------------------------------------------------------
+
+@@ -73,7 +75,8 @@
+ TextOutputDev.o AOutputDev.o XRef.o AGfx.o \
+ GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \
+ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \
+- Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o
++ Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o \
++ md5.o rc4.o
+ APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
+
+ Apdf: $(APDF_OBJS)
+@@ -96,137 +99,149 @@
+ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h
+ Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \
+- ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \
++ ../../xpdf/Catalog.h
+ Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h
+ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h
+ Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+ ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Gfx.h
++ ../../xpdf/Params.h ../../xpdf/Gfx.h
+ GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \
+- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
+ GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h
+ ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \
+ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \
+ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \
+- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \
++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h
+ Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h
+ Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Link.h
++ ../../xpdf/rc4.h ../../xpdf/Link.h
+ Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/XRef.h
+ OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/GfxState.h ../../xpdf/OutputDev.h
+ Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Gfx.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Params.h ../../xpdf/Page.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
++ ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h
+ Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \
+- ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \
++ ../../xpdf/XRef.h
+ PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \
+- ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/Params.h ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
+ ../../xpdf/OutputDev.h
+ PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \
+- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \
+- ../../xpdf/Error.h ../../xpdf/PDFDoc.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \
++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h
+ PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \
++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h
+ Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h
+ TextOutputDev.o: ../../xpdf/TextOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/TextOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h
+ XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/XRef.h ../../xpdf/md5.h
+ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h
+ Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
+ ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \
+- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
+ ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \
+- ../../xpdf/GfxFont.h ../../xpdf/Error.h ../../xpdf/AComm.h
++ ../../xpdf/GfxFont.h ../../xpdf/AComm.h
+ AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \
+- ../../xpdf/OutputDev.h ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/FontOutputDev.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
++ ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/FontOutputDev.h
+ FontOutputDev.o: ../../xpdf/FontOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/XOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h
+ AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \
+ ../../xpdf/poly.h
+ poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h
++md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \
++ ../../xpdf/config.h
++rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h
+diff -u -b -B -r -N -w xpdf-0.80/build040/xpdf/Makefile xpdf-0.80-decrypt/build040/xpdf/Makefile
+--- xpdf-0.80/build040/xpdf/Makefile Fri Jul 2 21:48:37 1999
++++ xpdf-0.80-decrypt/build040/xpdf/Makefile Wed Jul 7 21:07:00 1999
+@@ -59,7 +59,9 @@
+ $(srcdir)/AOutputDev.cc \
+ $(srcdir)/FontOutputDev.cc \
+ $(srcdir)/AGfx.cc \
+- $(srcdir)/poly.cc
++ $(srcdir)/poly.cc \
++ $(srcdir)/md5.cc \
++ $(srcdir)/rc4.cc
+
+ #------------------------------------------------------------------------
+
+@@ -73,7 +75,8 @@
+ TextOutputDev.o AOutputDev.o XRef.o AGfx.o \
+ GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \
+ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \
+- Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o
++ Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o \
++ md5.o rc4.o
+ APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
+
+ Apdf: $(APDF_OBJS)
+@@ -96,137 +99,149 @@
+ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h
+ Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \
+- ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \
++ ../../xpdf/Catalog.h
+ Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h
+ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h
+ Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+ ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Gfx.h
++ ../../xpdf/Params.h ../../xpdf/Gfx.h
+ GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \
+- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
+ GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h
+ ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \
+ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \
+ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \
+- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \
++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h
+ Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h
+ Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Link.h
++ ../../xpdf/rc4.h ../../xpdf/Link.h
+ Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/XRef.h
+ OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/GfxState.h ../../xpdf/OutputDev.h
+ Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Gfx.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Params.h ../../xpdf/Page.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
++ ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h
+ Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \
+- ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \
++ ../../xpdf/XRef.h
+ PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \
+- ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/Params.h ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
+ ../../xpdf/OutputDev.h
+ PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \
+- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \
+- ../../xpdf/Error.h ../../xpdf/PDFDoc.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \
++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h
+ PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \
++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h
+ Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h
+ TextOutputDev.o: ../../xpdf/TextOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/TextOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h
+ XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/XRef.h ../../xpdf/md5.h
+ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h
+ Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
+ ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \
+- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
+ ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \
+- ../../xpdf/GfxFont.h ../../xpdf/Error.h ../../xpdf/AComm.h
++ ../../xpdf/GfxFont.h ../../xpdf/AComm.h
+ AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \
+- ../../xpdf/OutputDev.h ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/FontOutputDev.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
++ ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/FontOutputDev.h
+ FontOutputDev.o: ../../xpdf/FontOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/XOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h
+ AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \
+ ../../xpdf/poly.h
+ poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h
++md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \
++ ../../xpdf/config.h
++rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h
+diff -u -b -B -r -N -w xpdf-0.80/build060/xpdf/Makefile xpdf-0.80-decrypt/build060/xpdf/Makefile
+--- xpdf-0.80/build060/xpdf/Makefile Thu Jun 24 18:18:12 1999
++++ xpdf-0.80-decrypt/build060/xpdf/Makefile Wed Jul 7 21:07:00 1999
+@@ -59,7 +59,10 @@
+ $(srcdir)/AOutputDev.cc \
+ $(srcdir)/FontOutputDev.cc \
+ $(srcdir)/AGfx.cc \
+- $(srcdir)/poly.cc
++ $(srcdir)/poly.cc \
++ $(srcdir)/md5.cc \
++ $(srcdir)/rc4.cc
++
+
+ #------------------------------------------------------------------------
+
+@@ -73,7 +76,8 @@
+ TextOutputDev.o AOutputDev.o XRef.o AGfx.o \
+ GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \
+ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \
+- Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o
++ Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o \
++ md5.o rc4.o
+ APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
+
+ Apdf: $(APDF_OBJS)
+@@ -96,137 +100,149 @@
+ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h
+ Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \
+- ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \
++ ../../xpdf/Catalog.h
+ Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h
+ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h
+ Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+ ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Gfx.h
++ ../../xpdf/Params.h ../../xpdf/Gfx.h
+ GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \
+- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
+ GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h
+ ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \
+ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \
+ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \
+- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \
++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h
+ Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h
+ Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Link.h
++ ../../xpdf/rc4.h ../../xpdf/Link.h
+ Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/XRef.h
+ OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/GfxState.h ../../xpdf/OutputDev.h
+ Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Gfx.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Params.h ../../xpdf/Page.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
++ ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h
+ Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \
+- ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \
++ ../../xpdf/XRef.h
+ PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \
+- ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/Params.h ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
+ ../../xpdf/OutputDev.h
+ PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \
+- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \
+- ../../xpdf/Error.h ../../xpdf/PDFDoc.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \
++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h
+ PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \
++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h
+ Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h
+ TextOutputDev.o: ../../xpdf/TextOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/TextOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h
+ XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/XRef.h ../../xpdf/md5.h
+ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h
+ Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
+ ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \
+- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
+ ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \
+- ../../xpdf/GfxFont.h ../../xpdf/Error.h ../../xpdf/AComm.h
++ ../../xpdf/GfxFont.h ../../xpdf/AComm.h
+ AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \
+- ../../xpdf/OutputDev.h ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/FontOutputDev.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
++ ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/FontOutputDev.h
+ FontOutputDev.o: ../../xpdf/FontOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/XOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h
+ AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \
+ ../../xpdf/poly.h
+ poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h
++md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \
++ ../../xpdf/config.h
++rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h
+diff -u -b -B -r -N -w xpdf-0.80/buildnofpu/xpdf/Makefile xpdf-0.80-decrypt/buildnofpu/xpdf/Makefile
+--- xpdf-0.80/buildnofpu/xpdf/Makefile Thu Jun 24 18:19:20 1999
++++ xpdf-0.80-decrypt/buildnofpu/xpdf/Makefile Wed Jul 7 21:07:01 1999
+@@ -59,7 +59,10 @@
+ $(srcdir)/AOutputDev.cc \
+ $(srcdir)/FontOutputDev.cc \
+ $(srcdir)/AGfx.cc \
+- $(srcdir)/poly.cc
++ $(srcdir)/poly.cc \
++ $(srcdir)/md5.cc \
++ $(srcdir)/rc4.cc
++
+
+ #------------------------------------------------------------------------
+
+@@ -73,7 +76,8 @@
+ TextOutputDev.o AOutputDev.o XRef.o AGfx.o \
+ GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \
+ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \
+- Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o
++ Apdfcommon.o Apdf.o ImageOutputDev.o poly.o FontOutputDev.o \
++ md5.o rc4.o
+ APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
+
+ Apdf: $(APDF_OBJS)
+@@ -96,137 +100,149 @@
+ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h
+ Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \
+- ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \
++ ../../xpdf/Catalog.h
+ Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h
+ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h
+ Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+ ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Gfx.h
++ ../../xpdf/Params.h ../../xpdf/Gfx.h
+ GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \
+- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
+ GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h
+ ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \
+ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \
+ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \
+- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \
++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h
+ Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h
+ Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Link.h
++ ../../xpdf/rc4.h ../../xpdf/Link.h
+ Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/XRef.h
+ OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/GfxState.h ../../xpdf/OutputDev.h
+ Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Gfx.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Params.h ../../xpdf/Page.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
++ ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h
+ Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \
+- ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \
++ ../../xpdf/XRef.h
+ PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \
+- ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/Params.h ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
+ ../../xpdf/OutputDev.h
+ PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \
+- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \
+- ../../xpdf/Error.h ../../xpdf/PDFDoc.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \
++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h
+ PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \
++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h
+ Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h
+ TextOutputDev.o: ../../xpdf/TextOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/TextOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h
+ XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/XRef.h ../../xpdf/md5.h
+ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h
+ Apdfcommon.o: ../../xpdf/Apdfcommon.cc ../../xpdf/../goo/parseargs.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
+ ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \
+- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
+ ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \
+- ../../xpdf/GfxFont.h ../../xpdf/Error.h ../../xpdf/AComm.h
++ ../../xpdf/GfxFont.h ../../xpdf/AComm.h
+ AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \
+- ../../xpdf/OutputDev.h ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/FontOutputDev.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
++ ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/FontOutputDev.h
+ FontOutputDev.o: ../../xpdf/FontOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/XOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h
+ AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \
+ ../../xpdf/poly.h
+ poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h
++md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \
++ ../../xpdf/config.h
++rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h
+diff -u -b -B -r -N -w xpdf-0.80/buildppc/xpdf/Makefile xpdf-0.80-decrypt/buildppc/xpdf/Makefile
+--- xpdf-0.80/buildppc/xpdf/Makefile Fri Jul 2 21:55:27 1999
++++ xpdf-0.80-decrypt/buildppc/xpdf/Makefile Wed Jul 7 21:07:01 1999
+@@ -68,7 +68,10 @@
+ $(srcdir)/FontOutputDev.cc \
+ $(srcdir)/AGfx.cc \
+ $(srcdir)/stub.cc \
+- $(srcdir)/poly.cc
++ $(srcdir)/poly.cc \
++ $(srcdir)/md5.cc \
++ $(srcdir)/rc4.cc
++
+
+ #------------------------------------------------------------------------
+
+@@ -87,7 +90,8 @@
+ TextOutputDev.o AOutputDev.o XRef.o apdfppcserv.o AGfx.o \
+ GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \
+ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \
+- apdfcommon.o ImageOutputDev.o poly.o FontOutputDev.o
++ apdfcommon.o ImageOutputDev.o poly.o FontOutputDev.o \
++ md5.o rc4.o
+ APDF_LIBS = -L$(GOOLIBDIR) -lGoo $(XLIBS) $(OTHERLIBS) -lm
+
+ Apdf.elf: $(APDF_OBJS)
+@@ -114,112 +118,119 @@
+ Array.o: ../../xpdf/Array.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h
+ Catalog.o: ../../xpdf/Catalog.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Page.h ../../xpdf/Error.h \
+- ../../xpdf/config.h ../../xpdf/Link.h ../../xpdf/Catalog.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Page.h ../../xpdf/Link.h \
++ ../../xpdf/Catalog.h
+ Dict.o: ../../xpdf/Dict.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h
+ Error.o: ../../xpdf/Error.cc ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h
+ Gfx.o: ../../xpdf/Gfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+ ../../xpdf/GfxFont.h ../../xpdf/GfxState.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Params.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Gfx.h
++ ../../xpdf/Params.h ../../xpdf/Gfx.h
+ GfxFont.o: ../../xpdf/GfxFont.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/gfile.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/Params.h \
+- ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Params.h ../../xpdf/GfxFont.h ../../xpdf/FontInfo.h
+ GfxState.o: ../../xpdf/GfxState.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/GfxState.h
+ ImageOutputDev.o: ../../xpdf/ImageOutputDev.cc \
+ ../../xpdf/../goo/gmem.h ../../xpdf/config.h ../../xpdf/Error.h \
+ ../../xpdf/GfxState.h ../../xpdf/../goo/gtypes.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/GString.h ../../xpdf/Array.h \
+- ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/ImageOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Dict.h ../../xpdf/Stream.h ../../xpdf/rc4.h \
++ ../../xpdf/ImageOutputDev.h ../../xpdf/OutputDev.h
+ Lexer.o: ../../xpdf/Lexer.cc ../../xpdf/Lexer.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h
+ Link.o: ../../xpdf/Link.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Error.h ../../xpdf/config.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Link.h
++ ../../xpdf/rc4.h ../../xpdf/Link.h
+ Object.o: ../../xpdf/Object.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/XRef.h
+ OutputDev.o: ../../xpdf/OutputDev.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/GfxState.h ../../xpdf/OutputDev.h
+ Page.o: ../../xpdf/Page.cc ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
+- ../../xpdf/Gfx.h ../../xpdf/Error.h ../../xpdf/config.h \
+- ../../xpdf/Params.h ../../xpdf/Page.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/XRef.h ../../xpdf/OutputDev.h \
++ ../../xpdf/Gfx.h ../../xpdf/Params.h ../../xpdf/Page.h
+ Parser.o: ../../xpdf/Parser.cc ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/Error.h \
+- ../../xpdf/config.h
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
++ ../../xpdf/Parser.h ../../xpdf/Lexer.h ../../xpdf/md5.h \
++ ../../xpdf/XRef.h
+ PBMOutputDev.o: ../../xpdf/PBMOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/Params.h \
+- ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/Params.h ../../xpdf/PBMOutputDev.h ../../xpdf/XOutputDev.h \
+ ../../xpdf/OutputDev.h
+ PDFDoc.o: ../../xpdf/PDFDoc.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Page.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Catalog.h ../../xpdf/XRef.h \
+- ../../xpdf/Link.h ../../xpdf/OutputDev.h ../../xpdf/Params.h \
+- ../../xpdf/Error.h ../../xpdf/PDFDoc.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/rc4.h \
++ ../../xpdf/Catalog.h ../../xpdf/XRef.h ../../xpdf/Link.h \
++ ../../xpdf/OutputDev.h ../../xpdf/Params.h ../../xpdf/PDFDoc.h
+ PSOutputDev.o: ../../xpdf/PSOutputDev.cc ../../xpdf/../goo/GString.h \
+ ../../xpdf/config.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
+- ../../xpdf/Error.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Catalog.h ../../xpdf/Page.h ../../xpdf/PSOutputDev.h \
+- ../../xpdf/OutputDev.h
++ ../../xpdf/Error.h ../../xpdf/rc4.h ../../xpdf/GfxState.h \
++ ../../xpdf/GfxFont.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
++ ../../xpdf/PSOutputDev.h ../../xpdf/OutputDev.h
+ Stream.o: ../../xpdf/Stream.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Stream-CCITT.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/Stream-CCITT.h
+ TextOutputDev.o: ../../xpdf/TextOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/TextOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/TextOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/TextOutputFontInfo.h
+ XRef.o: ../../xpdf/XRef.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/Object.h ../../xpdf/mystdio.h ../../xpdf/../goo/gtypes.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/XRef.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/Lexer.h ../../xpdf/Parser.h \
++ ../../xpdf/XRef.h ../../xpdf/md5.h
+ Apdf.o: ../../xpdf/Apdf.c ../../xpdf/config.h ../../xpdf/AComm.h \
+ ../../xpdf/AGfxcomm.h
+ Apdfppcserv.o: ../../xpdf/Apdfppcserv.cc ../../xpdf/AComm.h \
+@@ -228,29 +239,32 @@
+ ../../xpdf/../goo/gtypes.h ../../xpdf/../goo/GString.h \
+ ../../xpdf/../goo/gmem.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/Array.h ../../xpdf/Dict.h ../../xpdf/Stream.h \
++ ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/rc4.h \
+ ../../xpdf/XRef.h ../../xpdf/Catalog.h ../../xpdf/Page.h \
+ ../../xpdf/Link.h ../../xpdf/PDFDoc.h ../../xpdf/AOutputDev.h \
+- ../../xpdf/config.h ../../xpdf/OutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h \
+- ../../xpdf/TextOutputDev.h ../../xpdf/PSOutputDev.h \
+- ../../xpdf/ImageOutputDev.h ../../xpdf/FontOutputDev.h \
+- ../../xpdf/GfxFont.h ../../xpdf/Error.h
++ ../../xpdf/OutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h ../../xpdf/TextOutputDev.h \
++ ../../xpdf/PSOutputDev.h ../../xpdf/ImageOutputDev.h \
++ ../../xpdf/FontOutputDev.h ../../xpdf/GfxFont.h
+ AOutputDev.o: ../../xpdf/AOutputDev.cc ../../xpdf/../goo/gmem.h \
+ ../../xpdf/../goo/GString.h ../../xpdf/Object.h ../../xpdf/mystdio.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
+- ../../xpdf/Error.h ../../xpdf/config.h ../../xpdf/TextOutputDev.h \
+- ../../xpdf/OutputDev.h ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h \
+- ../../xpdf/poly.h ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h \
+- ../../xpdf/FontOutputDev.h
++ ../../xpdf/Stream.h ../../xpdf/Error.h ../../xpdf/config.h \
++ ../../xpdf/rc4.h ../../xpdf/GfxState.h ../../xpdf/GfxFont.h \
++ ../../xpdf/TextOutputDev.h ../../xpdf/OutputDev.h \
++ ../../xpdf/AOutputDev.h ../../xpdf/AGfx.h ../../xpdf/poly.h \
++ ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h ../../xpdf/FontOutputDev.h
+ FontOutputDev.o: ../../xpdf/FontOutputDev.cc \
+ ../../xpdf/../goo/GString.h ../../xpdf/../goo/gmem.h \
+ ../../xpdf/config.h ../../xpdf/Error.h ../../xpdf/GfxState.h \
+ ../../xpdf/../goo/gtypes.h ../../xpdf/GfxFont.h ../../xpdf/Object.h \
+ ../../xpdf/mystdio.h ../../xpdf/Array.h ../../xpdf/Dict.h \
+- ../../xpdf/Stream.h ../../xpdf/FontOutputDev.h ../../xpdf/OutputDev.h \
+- ../../xpdf/XOutputFontInfo.h
++ ../../xpdf/Stream.h ../../xpdf/rc4.h ../../xpdf/FontOutputDev.h \
++ ../../xpdf/OutputDev.h ../../xpdf/XOutputFontInfo.h
+ AGfx.o: ../../xpdf/AGfx.cc ../../xpdf/../goo/gmem.h ../../xpdf/AGfx.h \
+ ../../xpdf/poly.h ../../xpdf/AComm.h ../../xpdf/AGfxcomm.h
+ stub.o: ../../xpdf/stub.cc
+ poly.o: ../../xpdf/poly.cc ../../xpdf/poly.h
++md5.o: ../../xpdf/md5.cc ../../xpdf/md5.h ../../xpdf/Error.h \
++ ../../xpdf/config.h
++rc4.o: ../../xpdf/rc4.cc ../../xpdf/rc4.h
+diff -u -b -B -r -N -w xpdf-0.80/buildsas/xpdf/SMakefile xpdf-0.80-decrypt/buildsas/xpdf/SMakefile
+--- xpdf-0.80/buildsas/xpdf/SMakefile Thu Jun 24 18:20:30 1999
++++ xpdf-0.80-decrypt/buildsas/xpdf/SMakefile Wed Jul 7 21:07:01 1999
+@@ -67,7 +67,10 @@
+ $(srcdir)/AOutputDev.cc \
+ $(srcdir)/FontOutputDev.cc \
+ $(srcdir)/AGfx.cc \
+- $(srcdir)/poly.cc
++ $(srcdir)/poly.cc \
++ $(srcdir)/md5.cc \
++ $(srcdir)/rc4.cc
++
+
+ #------------------------------------------------------------------------
+
+@@ -82,7 +85,7 @@
+ GfxState.o Lexer.o Link.o Object.o OutputDev.o mystdio.o \
+ Page.o Parser.o PDFDoc.o PSOutputDev.o Stream.o \
+ Apdfcommon.o Apdf.o ImageOutputDev.o poly.o stub.o \
+- FontOutputDev.o
++ FontOutputDev.o md5.o rc4.o
+ APDF_LIBS = lib /goo/goo.lib $(OTHERLIBS)
+
+ Apdf: $(APDF_OBJS)
+@@ -112,137 +115,149 @@
+ Array.o: //xpdf/Array.cc //goo/gmem.h \
+ //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \
++ //xpdf/rc4.h
+ Catalog.o: //xpdf/Catalog.cc //goo/gmem.h \
+ //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/Page.h //xpdf/Error.h \
+- //xpdf/config.h //xpdf/Link.h //xpdf/Catalog.h
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \
++ //xpdf/rc4.h //xpdf/Page.h //xpdf/Link.h \
++ //xpdf/Catalog.h
+ Dict.o: //xpdf/Dict.cc //goo/gmem.h \
+ //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/XRef.h
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \
++ //xpdf/rc4.h //xpdf/XRef.h
+ Error.o: //xpdf/Error.cc //goo/gtypes.h \
+ //xpdf/Params.h //xpdf/Error.h //xpdf/config.h
+ Gfx.o: //xpdf/Gfx.cc //goo/gmem.h //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/Lexer.h //xpdf/Parser.h \
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \
++ //xpdf/rc4.h //xpdf/Lexer.h //xpdf/Parser.h \
+ //xpdf/GfxFont.h //xpdf/GfxState.h //xpdf/OutputDev.h \
+- //xpdf/Params.h //xpdf/Error.h //xpdf/config.h \
+- //xpdf/Gfx.h
++ //xpdf/Params.h //xpdf/Gfx.h
+ GfxFont.o: //xpdf/GfxFont.cc //goo/GString.h \
+ //goo/gmem.h //goo/gfile.h \
+ //goo/gtypes.h //xpdf/config.h //xpdf/Object.h \
+ //xpdf/mystdio.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/Error.h //xpdf/Params.h \
+- //xpdf/GfxFont.h //xpdf/FontInfo.h
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/rc4.h \
++ //xpdf/Params.h //xpdf/GfxFont.h //xpdf/FontInfo.h
+ GfxState.o: //xpdf/GfxState.cc //goo/gmem.h \
+ //xpdf/Error.h //xpdf/config.h //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/GfxState.h
++ //xpdf/Stream.h //xpdf/rc4.h //xpdf/GfxState.h
+ ImageOutputDev.o: //xpdf/ImageOutputDev.cc \
+ //goo/gmem.h //xpdf/config.h //xpdf/Error.h \
+ //xpdf/GfxState.h //goo/gtypes.h //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/GString.h //xpdf/Array.h \
+- //xpdf/Dict.h //xpdf/Stream.h //xpdf/ImageOutputDev.h \
+- //xpdf/OutputDev.h
++ //xpdf/Dict.h //xpdf/Stream.h //xpdf/rc4.h \
++ //xpdf/ImageOutputDev.h //xpdf/OutputDev.h
+ Lexer.o: //xpdf/Lexer.cc //xpdf/Lexer.h //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/gmem.h //goo/GString.h \
+ //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \
+- //xpdf/Error.h //xpdf/config.h
++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h
+ Link.o: //xpdf/Link.cc //goo/gmem.h \
+ //goo/GString.h //xpdf/Error.h //xpdf/config.h \
+ //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \
+ //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \
+- //xpdf/Link.h
++ //xpdf/rc4.h //xpdf/Link.h
+ Object.o: //xpdf/Object.cc //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/gmem.h //goo/GString.h \
+ //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \
+- //xpdf/Error.h //xpdf/config.h //xpdf/XRef.h
++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h \
++ //xpdf/XRef.h
+ OutputDev.o: //xpdf/OutputDev.cc //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/gmem.h //goo/GString.h \
+ //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \
++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h \
+ //xpdf/GfxState.h //xpdf/OutputDev.h
+ Page.o: //xpdf/Page.cc //xpdf/Object.h //xpdf/mystdio.h \
+ //goo/gtypes.h //goo/gmem.h \
+ //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/XRef.h //xpdf/OutputDev.h \
+- //xpdf/Gfx.h //xpdf/Error.h //xpdf/config.h \
+- //xpdf/Params.h //xpdf/Page.h
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \
++ //xpdf/rc4.h //xpdf/XRef.h //xpdf/OutputDev.h \
++ //xpdf/Gfx.h //xpdf/Params.h //xpdf/Page.h
+ Parser.o: //xpdf/Parser.cc //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/gmem.h //goo/GString.h \
+ //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \
+- //xpdf/Parser.h //xpdf/Lexer.h //xpdf/Error.h \
+- //xpdf/config.h
++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h \
++ //xpdf/Parser.h //xpdf/Lexer.h //xpdf/md5.h \
++ //xpdf/XRef.h
+ PBMOutputDev.o: //xpdf/PBMOutputDev.cc //goo/gmem.h \
+ //goo/GString.h //xpdf/Object.h //xpdf/mystdio.h \
+ //goo/gtypes.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/GfxState.h //xpdf/GfxFont.h \
+- //xpdf/Error.h //xpdf/config.h //xpdf/Params.h \
+- //xpdf/PBMOutputDev.h //xpdf/XOutputDev.h \
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \
++ //xpdf/rc4.h //xpdf/GfxState.h //xpdf/GfxFont.h \
++ //xpdf/Params.h //xpdf/PBMOutputDev.h //xpdf/XOutputDev.h \
+ //xpdf/OutputDev.h
+ PDFDoc.o: //xpdf/PDFDoc.cc //goo/GString.h \
+ //xpdf/config.h //xpdf/Page.h //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/gmem.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/Catalog.h //xpdf/XRef.h \
+- //xpdf/Link.h //xpdf/OutputDev.h //xpdf/Params.h \
+- //xpdf/Error.h //xpdf/PDFDoc.h
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/rc4.h \
++ //xpdf/Catalog.h //xpdf/XRef.h //xpdf/Link.h \
++ //xpdf/OutputDev.h //xpdf/Params.h //xpdf/PDFDoc.h
+ PSOutputDev.o: //xpdf/PSOutputDev.cc //goo/GString.h \
+ //xpdf/config.h //xpdf/Object.h //xpdf/mystdio.h \
+ //goo/gtypes.h //goo/gmem.h \
+ //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \
+- //xpdf/Error.h //xpdf/GfxState.h //xpdf/GfxFont.h \
+- //xpdf/Catalog.h //xpdf/Page.h //xpdf/PSOutputDev.h \
+- //xpdf/OutputDev.h
++ //xpdf/Error.h //xpdf/rc4.h //xpdf/GfxState.h \
++ //xpdf/GfxFont.h //xpdf/Catalog.h //xpdf/Page.h \
++ //xpdf/PSOutputDev.h //xpdf/OutputDev.h
+ Stream.o: //xpdf/Stream.cc //goo/gmem.h \
+ //xpdf/config.h //xpdf/Error.h //xpdf/Object.h \
+ //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/Stream-CCITT.h
++ //xpdf/Stream.h //xpdf/rc4.h //xpdf/Stream-CCITT.h
+ TextOutputDev.o: //xpdf/TextOutputDev.cc \
+ //goo/GString.h //goo/gmem.h \
+ //xpdf/config.h //xpdf/Error.h //xpdf/GfxState.h \
+ //goo/gtypes.h //xpdf/GfxFont.h //xpdf/Object.h \
+ //xpdf/mystdio.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/TextOutputDev.h //xpdf/OutputDev.h \
+- //xpdf/TextOutputFontInfo.h
++ //xpdf/Stream.h //xpdf/rc4.h //xpdf/TextOutputDev.h \
++ //xpdf/OutputDev.h //xpdf/TextOutputFontInfo.h
+ XRef.o: //xpdf/XRef.cc //goo/gmem.h \
+ //xpdf/Object.h //xpdf/mystdio.h //goo/gtypes.h \
+ //goo/GString.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/Lexer.h //xpdf/Parser.h \
+- //xpdf/Error.h //xpdf/config.h //xpdf/XRef.h
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \
++ //xpdf/rc4.h //xpdf/Lexer.h //xpdf/Parser.h \
++ //xpdf/XRef.h //xpdf/md5.h
+ Apdf.o: //xpdf/Apdf.c //xpdf/config.h //xpdf/AComm.h
+ Apdfcommon.o: //xpdf/Apdfcommon.cc //goo/parseargs.h \
+ //goo/gtypes.h //goo/GString.h \
+ //goo/gmem.h //xpdf/Object.h //xpdf/mystdio.h \
+ //xpdf/Array.h //xpdf/Dict.h //xpdf/Stream.h \
++ //xpdf/Error.h //xpdf/config.h //xpdf/rc4.h \
+ //xpdf/XRef.h //xpdf/Catalog.h //xpdf/Page.h \
+ //xpdf/Link.h //xpdf/PDFDoc.h //xpdf/AOutputDev.h \
+- //xpdf/config.h //xpdf/OutputDev.h //xpdf/AGfx.h \
+- //xpdf/poly.h //xpdf/TextOutputDev.h //xpdf/PSOutputDev.h \
++ //xpdf/OutputDev.h //xpdf/AGfx.h //xpdf/poly.h \
++ //xpdf/TextOutputDev.h //xpdf/PSOutputDev.h \
+ //xpdf/ImageOutputDev.h //xpdf/FontOutputDev.h \
+- //xpdf/GfxFont.h //xpdf/Error.h //xpdf/AComm.h
++ //xpdf/GfxFont.h //xpdf/AComm.h
+ AOutputDev.o: //xpdf/AOutputDev.cc //goo/gmem.h \
+ //goo/GString.h //xpdf/Object.h //xpdf/mystdio.h \
+ //goo/gtypes.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/GfxState.h //xpdf/GfxFont.h \
+- //xpdf/Error.h //xpdf/config.h //xpdf/TextOutputDev.h \
+- //xpdf/OutputDev.h //xpdf/AOutputDev.h //xpdf/AGfx.h \
+- //xpdf/poly.h //xpdf/FontOutputDev.h
++ //xpdf/Stream.h //xpdf/Error.h //xpdf/config.h \
++ //xpdf/rc4.h //xpdf/GfxState.h //xpdf/GfxFont.h \
++ //xpdf/TextOutputDev.h //xpdf/OutputDev.h \
++ //xpdf/AOutputDev.h //xpdf/AGfx.h //xpdf/poly.h \
++ //xpdf/FontOutputDev.h
+ FontOutputDev.o: //xpdf/FontOutputDev.cc \
+ //goo/GString.h //goo/gmem.h \
+ //xpdf/config.h //xpdf/Error.h //xpdf/GfxState.h \
+ //goo/gtypes.h //xpdf/GfxFont.h //xpdf/Object.h \
+ //xpdf/mystdio.h //xpdf/Array.h //xpdf/Dict.h \
+- //xpdf/Stream.h //xpdf/FontOutputDev.h //xpdf/OutputDev.h \
+- //xpdf/XOutputFontInfo.h
++ //xpdf/Stream.h //xpdf/rc4.h //xpdf/FontOutputDev.h \
++ //xpdf/OutputDev.h //xpdf/XOutputFontInfo.h
+ AGfx.o: //xpdf/AGfx.cc //goo/gmem.h //xpdf/AGfx.h \
+ //xpdf/poly.h
+ poly.o: //xpdf/poly.cc //xpdf/poly.h
++md5.o: //xpdf/md5.cc //xpdf/md5.h //xpdf/Error.h \
++ //xpdf/config.h
++rc4.o: //xpdf/rc4.cc //xpdf/rc4.h
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/Makefile.in xpdf-0.80-decrypt/xpdf/Makefile.in
+--- xpdf-0.80/xpdf/Makefile.in Tue Apr 27 18:54:12 1999
++++ xpdf-0.80-decrypt/xpdf/Makefile.in Wed Jul 7 21:07:02 1999
@@ -76,7 +76,7 @@
XPDF_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
GfxState.o Lexer.o Link.o LTKOutputDev.o Object.o OutputDev.o \
@@ -16,7 +1428,7 @@
XPDF_LIBS = -L$(LTKLIBDIR) -lLTK -L$(GOOLIBDIR) -lGoo $(XLIBS) $(OTHERLIBS) -lm
xpdf$(EXE): $(XPDF_OBJS)
-@@ -92,7 +92,7 @@
+@@ -104,7 +104,7 @@
PDFTOPS_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o \
@@ -25,7 +1437,7 @@
PDFTOPS_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
pdftops$(EXE): $(PDFTOPS_OBJS)
-@@ -103,7 +103,7 @@
+@@ -115,7 +115,7 @@
PDFTOTEXT_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o Params.o \
@@ -34,7 +1446,7 @@
PDFTOTEXT_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
pdftotext$(EXE): $(PDFTOTEXT_OBJS)
-@@ -115,7 +115,7 @@
+@@ -127,7 +127,7 @@
PDFINFO_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
GfxState.o Lexer.o Link.o Object.o OutputDev.o Page.o \
@@ -43,7 +1455,7 @@
PDFINFO_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
pdfinfo$(EXE): $(PDFINFO_OBJS)
-@@ -127,7 +127,7 @@
+@@ -139,7 +139,7 @@
PDFTOPBM_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
GfxState.o Lexer.o Link.o Object.o OutputDev.o PBMOutputDev.o \
Page.o Params.o Parser.o PDFDoc.o Stream.o TextOutputDev.o \
@@ -52,7 +1464,7 @@
PDFTOPBM_LIBS = -L$(GOOLIBDIR) -lGoo $(XLIBS) $(OTHERLIBS) -lm
pdftopbm$(EXE): $(PDFTOPBM_OBJS)
-@@ -138,7 +138,7 @@
+@@ -150,7 +150,7 @@
PDFIMAGES_OBJS = Array.o Catalog.o Dict.o Error.o Gfx.o GfxFont.o \
GfxState.o ImageOutputDev.o Lexer.o Link.o Object.o OutputDev.o \
@@ -61,9 +1473,9 @@
PDFIMAGES_LIBS = -L$(GOOLIBDIR) -lGoo $(OTHERLIBS) -lm
pdfimages$(EXE): $(PDFIMAGES_OBJS)
-diff -urN xpdf-0.80.orig/xpdf/Parser.cc xpdf-0.80/xpdf/Parser.cc
---- xpdf-0.80.orig/xpdf/Parser.cc Sat Nov 28 13:47:03 1998
-+++ xpdf-0.80/xpdf/Parser.cc Thu Dec 17 23:28:17 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/Parser.cc xpdf-0.80-decrypt/xpdf/Parser.cc
+--- xpdf-0.80/xpdf/Parser.cc Tue Apr 27 18:54:12 1999
++++ xpdf-0.80-decrypt/xpdf/Parser.cc Wed Jul 7 21:07:02 1999
@@ -16,6 +16,8 @@
#include "Dict.h"
#include "Parser.h"
@@ -196,9 +1608,9 @@
+
+ return obj;
}
-diff -urN xpdf-0.80.orig/xpdf/Parser.h xpdf-0.80/xpdf/Parser.h
---- xpdf-0.80.orig/xpdf/Parser.h Sat Nov 28 13:47:09 1998
-+++ xpdf-0.80/xpdf/Parser.h Thu Dec 17 23:28:17 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/Parser.h xpdf-0.80-decrypt/xpdf/Parser.h
+--- xpdf-0.80/xpdf/Parser.h Tue Apr 27 18:54:12 1999
++++ xpdf-0.80-decrypt/xpdf/Parser.h Wed Jul 7 21:07:02 1999
@@ -30,6 +30,8 @@
// Get the next object from the input stream.
@@ -208,9 +1620,9 @@
// Get stream.
Stream *getStream() { return lexer->getStream(); }
-diff -urN xpdf-0.80.orig/xpdf/Stream.cc xpdf-0.80/xpdf/Stream.cc
---- xpdf-0.80.orig/xpdf/Stream.cc Sat Nov 28 13:47:24 1998
-+++ xpdf-0.80/xpdf/Stream.cc Wed Dec 16 17:03:01 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/Stream.cc xpdf-0.80-decrypt/xpdf/Stream.cc
+--- xpdf-0.80/xpdf/Stream.cc Sat Jul 3 11:08:50 1999
++++ xpdf-0.80-decrypt/xpdf/Stream.cc Wed Jul 7 21:07:03 1999
@@ -415,6 +415,7 @@
bufPos = start;
savePos = -1;
@@ -221,7 +1633,7 @@
FileStream::~FileStream() {
@@ -443,9 +444,19 @@
n = 256;
- n = fread(buf, 1, n, f);
+ n = myfread(buf, 1, n, f);
bufEnd = buf + n;
+ if (encryption == gTrue) {
+ rc4Crypt(&rc4Key, (unsigned char *)buf, n);
@@ -239,11 +1651,11 @@
}
void FileStream::setPos(int pos1) {
-diff -urN xpdf-0.80.orig/xpdf/Stream.h xpdf-0.80/xpdf/Stream.h
---- xpdf-0.80.orig/xpdf/Stream.h Sat Nov 28 13:47:33 1998
-+++ xpdf-0.80/xpdf/Stream.h Thu Dec 17 23:28:17 1998
-@@ -16,6 +16,8 @@
- #include <stdio.h>
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/Stream.h xpdf-0.80-decrypt/xpdf/Stream.h
+--- xpdf-0.80/xpdf/Stream.h Sun Jun 20 16:33:20 1999
++++ xpdf-0.80-decrypt/xpdf/Stream.h Wed Jul 7 21:07:03 1999
+@@ -17,6 +17,8 @@
+ #include "mystdio.h"
#include "gtypes.h"
#include "Object.h"
+#include "Error.h"
@@ -251,7 +1663,7 @@
//------------------------------------------------------------------------
-@@ -104,6 +106,8 @@
+@@ -105,6 +107,8 @@
// Returns the new stream.
Stream *addFilters(Object *dict);
@@ -260,7 +1672,7 @@
private:
Stream *makeFilter(char *name, Stream *str, Object *params);
-@@ -156,8 +160,12 @@
+@@ -157,8 +161,12 @@
private:
@@ -270,12 +1682,12 @@
+ RC4KEY rc4Key;
+ GBool encryption;
- FILE *f;
+ myFILE *f;
int start;
int length;
-diff -urN xpdf-0.80.orig/xpdf/XRef.cc xpdf-0.80/xpdf/XRef.cc
---- xpdf-0.80.orig/xpdf/XRef.cc Sat Nov 28 13:48:14 1998
-+++ xpdf-0.80/xpdf/XRef.cc Thu Dec 17 23:28:17 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/XRef.cc xpdf-0.80-decrypt/xpdf/XRef.cc
+--- xpdf-0.80/xpdf/XRef.cc Tue Apr 27 18:54:13 1999
++++ xpdf-0.80-decrypt/xpdf/XRef.cc Wed Jul 7 21:07:03 1999
@@ -22,6 +22,8 @@
#include "Dict.h"
#include "Error.h"
@@ -302,16 +1714,13 @@
+ m_okToChange = gTrue;
+ m_okToAddNotes = gTrue;
if (checkEncrypted()) {
-- ok = gFalse;
-- xref = oldXref;
-- return;
+ if (setupDecryption() == gFalse) {
-+ ok = gFalse;
-+ xref = oldXref;
-+ return;
-+ }
+ ok = gFalse;
+ xref = oldXref;
+ return;
}
}
++}
XRef::~XRef() {
gfree(entries);
@@ -363,11 +1772,10 @@
if (obj1.isInt() && obj1.getInt() == num &&
obj2.isInt() && obj2.getInt() == gen &&
obj3.isCmd("obj")) {
-- parser->getObj(obj);
+ if (encrypted) {
+ parser->getEncryptedObj(obj, num, gen);
+ } else {
-+ parser->getObj(obj);
+ parser->getObj(obj);
+ }
} else {
obj->initNull();
@@ -522,10 +1930,10 @@
+ preparedPassword->append(&acFill[0], 32);
+ return gTrue;
}
-diff -urN xpdf-0.80.orig/xpdf/XRef.h xpdf-0.80/xpdf/XRef.h
---- xpdf-0.80.orig/xpdf/XRef.h Sat Nov 28 13:48:39 1998
-+++ xpdf-0.80/xpdf/XRef.h Thu Dec 17 23:03:08 1998
-@@ -43,15 +43,20 @@
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/XRef.h xpdf-0.80-decrypt/xpdf/XRef.h
+--- xpdf-0.80/xpdf/XRef.h Sun Jun 20 16:26:50 1999
++++ xpdf-0.80-decrypt/xpdf/XRef.h Wed Jul 7 21:07:03 1999
+@@ -44,15 +44,20 @@
GBool isOk() { return ok; }
// Is the file encrypted?
@@ -547,7 +1955,7 @@
// Fetch an indirect reference.
Object *fetch(int num, int gen, Object *obj);
-@@ -68,6 +73,19 @@
+@@ -69,6 +74,19 @@
int rootNum, rootGen; // catalog dict
GBool ok; // true if xref table is valid
Object trailerDict; // trailer dictionary
@@ -567,9 +1975,9 @@
int readTrailer(FileStream *str);
GBool readXRef(FileStream *str, int *pos);
-diff -urN xpdf-0.80.orig/xpdf/config.h xpdf-0.80/xpdf/config.h
---- xpdf-0.80.orig/xpdf/config.h Sat Nov 28 13:42:17 1998
-+++ xpdf-0.80/xpdf/config.h Thu Dec 17 23:28:17 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/config.h xpdf-0.80-decrypt/xpdf/config.h
+--- xpdf-0.80/xpdf/config.h Wed Jul 7 16:05:47 1999
++++ xpdf-0.80-decrypt/xpdf/config.h Wed Jul 7 21:07:05 1999
@@ -4,6 +4,9 @@
//
// Copyright 1996 Derek B. Noonburg
@@ -580,26 +1988,28 @@
//========================================================================
#ifndef CONFIG_H
-@@ -14,7 +17,7 @@
+@@ -14,8 +17,8 @@
//------------------------------------------------------------------------
// xpdf version
-#define xpdfVersion "0.80"
+-#define apdfVersion "1.3"
+#define xpdfVersion "0.80 (decryption)"
++#define apdfVersion "1.3 (decryption)"
+ #define apdfVerString "Apdf 1.3 (7.7.99)"
// supported PDF version
- #define pdfVersion "1.2"
-@@ -22,6 +25,7 @@
-
+@@ -23,6 +26,7 @@
+ #define pdfVersionNum 1.2
// copyright notice
#define xpdfCopyright "Copyright \251 1996-1998 Derek B. Noonburg"
+#define xpdfCopyright_Encryption "Decryption (originally) by Leo J.B. Smiers"
// default paper size (in points) for PostScript output
#ifdef A4_PAPER
-diff -urN xpdf-0.80.orig/xpdf/md5.cc xpdf-0.80/xpdf/md5.cc
---- xpdf-0.80.orig/xpdf/md5.cc Thu Jan 1 10:00:00 1970
-+++ xpdf-0.80/xpdf/md5.cc Wed Dec 16 17:03:01 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/md5.cc xpdf-0.80-decrypt/xpdf/md5.cc
+--- xpdf-0.80/xpdf/md5.cc Thu Jan 1 00:00:00 1970
++++ xpdf-0.80-decrypt/xpdf/md5.cc Wed Jul 7 21:07:05 1999
@@ -0,0 +1,544 @@
+// MD5.CC - source code for the C++/object oriented translation and
+// modification of MD5.
@@ -647,8 +2057,8 @@
+
+
+
-+
+#include "md5.h"
++#include "Error.h"
+
+#include <assert.h>
+#include <strings.h>
@@ -678,7 +2088,7 @@
+ uint4 buffer_space; // how much space is left in buffer
+
+ if (finalized){ // so we can't update!
-+ cerr << "MD5::update: Can't update a finalized digest!" << endl;
++ error(-1, "MD5::update: Can't update a finalized digest!\n");
+ return;
+ }
+
@@ -716,7 +2126,7 @@
+}
+
+
-+
++#if 0
+// MD5 update for files.
+// Like above, except that it works on files (and uses above as a primitive.)
+
@@ -774,7 +2184,7 @@
+
+}
+
-+
++#endif
+
+
+
@@ -794,7 +2204,7 @@
+ };
+
+ if (finalized){
-+ cerr << "MD5::finalize: Already finalized this digest!" << endl;
++ error(-1, "MD5::finalize: Already finalized this digest!\n");
+ return;
+ }
+
@@ -820,7 +2230,7 @@
+}
+
+
-+
++#if 0
+
+MD5::MD5(FILE *file){
+
@@ -848,15 +2258,15 @@
+ finalize();
+}
+
-+
++#endif
+
+unsigned char *MD5::raw_digest(){
+
+ uint1 *s = new uint1[16];
+
+ if (!finalized){
-+ cerr << "MD5::raw_digest: Can't get digest if you haven't "<<
-+ "finalized the digest!" <<endl;
++ error(-1, "MD5::raw_digest: Can't get digest if you haven't "
++ "finalized the digest!\n");
+ return ( (unsigned char*) "");
+ }
+
@@ -872,8 +2282,8 @@
+ char *s= new char[33];
+
+ if (!finalized){
-+ cerr << "MD5::hex_digest: Can't get digest if you haven't "<<
-+ "finalized the digest!" <<endl;
++ error(-1, "MD5::hex_digest: Can't get digest if you haven't "
++ "finalized the digest!\n");
+ return "";
+ }
+
@@ -887,7 +2297,7 @@
+
+
+
-+
++#if 0
+
+ostream& operator<<(ostream &stream, MD5 context){
+
@@ -895,7 +2305,7 @@
+ return stream;
+}
+
-+
++#endif
+
+
+// PRIVATE METHODS:
@@ -1145,9 +2555,9 @@
+ a += I(b, c, d) + x + ac;
+ a = rotate_left (a, s) +b;
+}
-diff -urN xpdf-0.80.orig/xpdf/md5.h xpdf-0.80/xpdf/md5.h
---- xpdf-0.80.orig/xpdf/md5.h Thu Jan 1 10:00:00 1970
-+++ xpdf-0.80/xpdf/md5.h Wed Dec 16 17:03:01 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/md5.h xpdf-0.80-decrypt/xpdf/md5.h
+--- xpdf-0.80/xpdf/md5.h Thu Jan 1 00:00:00 1970
++++ xpdf-0.80-decrypt/xpdf/md5.h Wed Jul 7 21:07:05 1999
@@ -0,0 +1,109 @@
+// MD5.CC - source code for the C++/object oriented translation and
+// modification of MD5.
@@ -1258,9 +2668,9 @@
+ uint4 s, uint4 ac);
+
+};
-diff -urN xpdf-0.80.orig/xpdf/pdftops.cc xpdf-0.80/xpdf/pdftops.cc
---- xpdf-0.80.orig/xpdf/pdftops.cc Sat Nov 28 13:42:16 1998
-+++ xpdf-0.80/xpdf/pdftops.cc Wed Dec 16 17:03:01 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/pdftops.cc xpdf-0.80-decrypt/xpdf/pdftops.cc
+--- xpdf-0.80/xpdf/pdftops.cc Tue Apr 27 18:54:22 1999
++++ xpdf-0.80-decrypt/xpdf/pdftops.cc Wed Jul 7 21:07:05 1999
@@ -68,6 +68,7 @@
if (!ok || argc < 2 || argc > 3 || printHelp) {
fprintf(stderr, "pdftops version %s\n", xpdfVersion);
@@ -1269,9 +2679,9 @@
printUsage("pdftops", "<PDF-file> [<PS-file>]", argDesc);
exit(1);
}
-diff -urN xpdf-0.80.orig/xpdf/pdftotext.cc xpdf-0.80/xpdf/pdftotext.cc
---- xpdf-0.80.orig/xpdf/pdftotext.cc Sat Nov 28 13:42:16 1998
-+++ xpdf-0.80/xpdf/pdftotext.cc Wed Dec 16 17:03:01 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/pdftotext.cc xpdf-0.80-decrypt/xpdf/pdftotext.cc
+--- xpdf-0.80/xpdf/pdftotext.cc Tue Apr 27 18:54:22 1999
++++ xpdf-0.80-decrypt/xpdf/pdftotext.cc Wed Jul 7 21:07:06 1999
@@ -59,6 +59,7 @@
if (!ok || argc < 2 || argc > 3 || printHelp) {
fprintf(stderr, "pdftotext version %s\n", xpdfVersion);
@@ -1280,9 +2690,9 @@
printUsage("pdftotext", "<PDF-file> [<text-file>]", argDesc);
exit(1);
}
-diff -urN xpdf-0.80.orig/xpdf/rc4.cc xpdf-0.80/xpdf/rc4.cc
---- xpdf-0.80.orig/xpdf/rc4.cc Thu Jan 1 10:00:00 1970
-+++ xpdf-0.80/xpdf/rc4.cc Wed Dec 16 17:03:01 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/rc4.cc xpdf-0.80-decrypt/xpdf/rc4.cc
+--- xpdf-0.80/xpdf/rc4.cc Thu Jan 1 00:00:00 1970
++++ xpdf-0.80-decrypt/xpdf/rc4.cc Wed Jul 7 21:07:06 1999
@@ -0,0 +1,70 @@
+/************************************************************************
+ * *
@@ -1354,9 +2764,9 @@
+ rc4->x = x;
+ rc4->y = y;
+}
-diff -urN xpdf-0.80.orig/xpdf/rc4.h xpdf-0.80/xpdf/rc4.h
---- xpdf-0.80.orig/xpdf/rc4.h Thu Jan 1 10:00:00 1970
-+++ xpdf-0.80/xpdf/rc4.h Wed Dec 16 17:03:01 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/rc4.h xpdf-0.80-decrypt/xpdf/rc4.h
+--- xpdf-0.80/xpdf/rc4.h Thu Jan 1 00:00:00 1970
++++ xpdf-0.80-decrypt/xpdf/rc4.h Wed Jul 7 21:07:06 1999
@@ -0,0 +1,25 @@
+#include <limits.h>
+
@@ -1383,9 +2793,9 @@
+void rc4ExpandKey( RC4KEY *rc4, unsigned char const *key, int keylen );
+void rc4Crypt( RC4KEY *rc4, unsigned char *data, int len );
+#endif
-diff -urN xpdf-0.80.orig/xpdf/xpdf.cc xpdf-0.80/xpdf/xpdf.cc
---- xpdf-0.80.orig/xpdf/xpdf.cc Sat Nov 28 13:42:16 1998
-+++ xpdf-0.80/xpdf/xpdf.cc Wed Dec 16 17:03:01 1998
+diff -u -b -B -r -N -w xpdf-0.80/xpdf/xpdf.cc xpdf-0.80-decrypt/xpdf/xpdf.cc
+--- xpdf-0.80/xpdf/xpdf.cc Tue Apr 27 18:54:23 1999
++++ xpdf-0.80-decrypt/xpdf/xpdf.cc Wed Jul 7 21:07:06 1999
@@ -334,6 +334,7 @@
if (!ok || printHelp) {
fprintf(stderr, "xpdf version %s\n", xpdfVersion);
@@ -1402,110 +2812,3 @@
// open PDF file
defPSFileName = app->getStringResource("psFile", NULL);
-diff -urN xpdf-0.80.orig/README.decryption xpdf-0.80/README.decryption
---- xpdf-0.80.orig/README.decryption Thu Jan 1 10:00:00 1970
-+++ xpdf-0.80/README.decryption Wed Dec 16 17:03:01 1998
-@@ -0,0 +1,103 @@
-+xpdf version 0.80 with decryption patches
-+
-+With the release of version 0.80 of xpdf, I have retaken the decryption patch
-+for this new version.
-+
-+Due to the changes that came with the 0.80 release, some re-working of parts of
-+the decryption code became necessary in order to make it all work.
-+
-+Most of the comments (below) for version 0.7a still apply.
-+
-+DISCLAIMER: I know next to nothing about decryption. All I did was hack the
-+code to make it work.
-+
-+Tony Nugent <Tony.Nugent@usq.edu.au>
-+December 1998
-+
-+==========================================================================
-+
-+xpdf version 0.7a with decryption patches
-+
-+Author: Derek B. Noonburg <derekn@foolabs.com>
-+URL: http://www.foolabs.com/xpdf/
-+Sources: ftp://ftp.foolabs.com/pub/xpdf/xpdf-0.7a.tar.gz
-+ ftp://ftp.foolabs.com/pub/xpdf/xpdf-0.7a-patch1
-+ ftp://ftp.foolabs.com/pub/xpdf/xpdf-0.7a-patch2
-+ ftp://ftp.sci.usq.edu.au/pub/linux/xpdf/xpdf-0.7a-patch3
-+Packager: Tony Nugent <Tony.Nugent@usq.edu.au>
-+
-+This is a xpdf version 0.7a, but with the Makefile, divide-by-zero, and
-+decryption patches added to it.
-+
-+For the reasons why xpdf, as distributed, is not capable of handling
-+encrypted pdf files, please see:
-+
-+http://www.foolabs.com/xpdf/decryption.html
-+
-+What I have done is to add the decryption patches, and make all the sources
-+available in a place off the US continent.
-+
-+This was born out of personal necessity... I had an encrypted pdf file that
-+I *HAD* to read, so I went off to get the decryption patches for it from:
-+
-+http://people.a2000.nl/lsmiers/pdf/xpdf.html
-+
-+The patches were made available by Leo Smiers <L.Smiers@cable.A2000.nl> (in
-+Europe, a place that also avoids problems with the senseless US exportation
-+laws on encryption code). Everything that was needed was in a file called
-+"encryption.tar.gz", but I found that they didn't apply easily or cleanly,
-+and it also involved "dropping in" some files into the xpdf source tree.
-+
-+Once I got it working, I simply retook the patch again so that all the
-+source files and patches were all included in one file.
-+
-+Now all that is needed is "patch -p1 < patchfile" and everything is done.
-+(Then you "configure" and "make" as usual).
-+
-+I then grabbed xpdf-0.7a-1.src.rpm from RedHat's "rawhide" ("5.2-beta")
-+distribution and made some minor changes to it so that a decryption-capable
-+version could be easily rebuilt from a .spec file.
-+
-+So that's what I did, and this is the result. It seems to work just fine.
-+
-+I did some minor changes to RedHat's .spec file in the rpm so that it is
-+installed into /usr/X11R6/bin rather than /usr/bin and also to put the
-+ANNOUNCE file into the /usr/doc/xpdf-0.7a/ directory.
-+
-+I have contacted Derek (the author of xpdf) and got his blessing for what
-+I've done. I've also tried to contact Leo (from who's web site I got the
-+decryption patches), but in almost two months he has not replied.
-+
-+I wrote this README file to document what I've done, then did some
-+some teaking of the rpm spec file to get this added to the installation
-+documation directory.
-+
-+From my understanding of the US laws on the export of encryption code,
-+export of the sources for this patched version of the package is not
-+permitted from the United States in electronic format. (If you do this,
-+you are considered to be an arms dealer!) As I understand it, the
-+restrictions apply to taking such code *out* of the US in electronic
-+format, not importing it nor taking it out in printed format.
-+
-+I don't live in the United States and we don't have silly laws like this
-+here in Australia, so I can do what I like with these sources.
-+
-+I'm quite happy to put the resulting patch and the source and (glibc6)
-+binary RPM files up on our web site and ftp server for general
-+distribution.
-+
-+I will submitted the rpm packages to RedHat, leaving it up to them to do
-+what they want (err... can) with it. They might be able to use the binary
-+version, but the probably won't be legally able to redistribute it (to
-+places outside the US).
-+
-+Derek's web pages for xpdf are an excellent resource which I would strongly
-+recommend a visit to it:
-+
-+http://www.foolabs.com/xpdf/
-+
-+ -=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-
-+ Tony Nugent <Tony.Nugent@usq.edu.au> <linux@usq.edu.au>
-+ Computer Systems Officer Faculty of Science
-+ University of Southern Queensland, Toowoomba Oueensland Australia
-+ -=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-=*#*=-