summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvipdfmx
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-03-11 07:25:52 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-03-11 07:25:52 +0000
commite8b6682ed539f76a81a7be257185634cd01ed000 (patch)
treea05fbd9d8ea9a0b67d3011aa2a986e06f729c4c3 /Build/source/texk/xdvipdfmx
parent3584b3fd37a37c0c9da6474c55f77e66c146a596 (diff)
Sync with dvipdfmx-20110311
git-svn-id: svn://tug.org/texlive/trunk@21685 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL4
-rw-r--r--Build/source/texk/xdvipdfmx/src/dpxcrypt.c17
2 files changed, 13 insertions, 8 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 8be817b3427..dbb47c46ca2 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -1,6 +1,10 @@
ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
=================================================
+2011-03-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * src/dpxcrypt.c: Sync with dvipdfmx.
+
2011-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* src/cff_dict.h, src/cff_types.h, src/cmap.c, src/cmap_write.c,
diff --git a/Build/source/texk/xdvipdfmx/src/dpxcrypt.c b/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
index 8c818b038d5..4bad1620485 100644
--- a/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
+++ b/Build/source/texk/xdvipdfmx/src/dpxcrypt.c
@@ -1,4 +1,4 @@
-/* $Header: /home/cvsroot/dvipdfmx/src/dpxcrypt.c,v 1.3 2011/03/06 03:14:13 chofchof Exp $
+/* $Header: /home/cvsroot/dvipdfmx/src/dpxcrypt.c,v 1.4 2011/03/11 03:12:23 chofchof Exp $
This is DVIPDFMx, an eXtended version of DVIPDFM by Mark A. Wicks.
@@ -24,6 +24,7 @@
#include "config.h"
#endif
+#include <stdint.h>
#include <string.h>
#include "dpxcrypt.h"
@@ -89,12 +90,12 @@ void MD5_init (MD5_CONTEXT *ctx)
/* transform n*64 bytes */
static void transform (MD5_CONTEXT *ctx, const unsigned char *data)
{
- unsigned long correct_words[16];
- register unsigned long A = ctx->A;
- register unsigned long B = ctx->B;
- register unsigned long C = ctx->C;
- register unsigned long D = ctx->D;
- unsigned long *cwp = correct_words;
+ uint32_t correct_words[16];
+ register uint32_t A = ctx->A;
+ register uint32_t B = ctx->B;
+ register uint32_t C = ctx->C;
+ register uint32_t D = ctx->D;
+ uint32_t *cwp = correct_words;
#ifdef WORDS_BIGENDIAN
{ int i; const unsigned char *p1; unsigned char *p2;
@@ -103,7 +104,7 @@ static void transform (MD5_CONTEXT *ctx, const unsigned char *data)
}
}
#else
- memcpy(correct_words, data, 64);
+ memcpy(correct_words, data, sizeof(uint32_t) * 16);
#endif
#define OP(a, b, c, d, s, T) \